tjh.dev
waf: prefix all setup-hook variables with `waf`
Standardizing the behaviour of commit a79a8f29bc509b2d51158846c9562e64e1239b4c.
+1
-1
pkgs/development/tools/build-managers/waf/hook.nix
+1
-1
pkgs/development/tools/build-managers/waf/hook.nix
···
13
13
# waf is not inserted into propagatedBuildInputs, rather it is inserted
14
14
# directly
15
15
inherit waf;
16
-
crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
16
+
wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
17
17
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
18
18
};
19
19
+9
-9
pkgs/development/tools/build-managers/waf/setup-hook.sh
+9
-9
pkgs/development/tools/build-managers/waf/setup-hook.sh
···
19
19
local flagsArray=(
20
20
$prefixFlag
21
21
$wafConfigureFlags "${wafConfigureFlagsArray[@]}"
22
-
${configureTargets:-configure}
22
+
${wafConfigureTargets:-configure}
23
23
)
24
24
25
25
if [ -z "${dontAddWafCrossFlags:-}" ]; then
26
-
flagsArray+=(@crossFlags@)
26
+
flagsArray+=(@wafCrossFlags@)
27
27
fi
28
28
29
-
echoCmd 'configure flags' "${flagsArray[@]}"
29
+
echoCmd 'waf configure flags' "${flagsArray[@]}"
30
30
python "$wafPath" "${flagsArray[@]}"
31
31
32
32
if ! [[ -v enableParallelBuilding ]]; then
···
51
51
local flagsArray=(
52
52
${enableParallelBuilding:+-j ${NIX_BUILD_CORES}}
53
53
$wafFlags ${wafFlagsArray[@]}
54
-
$buildFlags ${buildFlagsArray[@]}
55
-
${buildTargets:-build}
54
+
$wafBuildFlags ${wafBuildFlagsArray[@]}
55
+
${wafBuildTargets:-build}
56
56
)
57
57
58
-
echoCmd 'build flags' "${flagsArray[@]}"
58
+
echoCmd 'waf build flags' "${flagsArray[@]}"
59
59
python "$wafPath" "${flagsArray[@]}"
60
60
61
61
runHook postBuild
···
71
71
local flagsArray=(
72
72
${enableParallelInstalling:+-j ${NIX_BUILD_CORES}}
73
73
$wafFlags ${wafFlagsArray[@]}
74
-
$installFlags ${installFlagsArray[@]}
75
-
${installTargets:-install}
74
+
$wafInstallFlags ${wafInstallFlagsArray[@]}
75
+
${wafInstallTargets:-install}
76
76
)
77
77
78
-
echoCmd 'install flags' "${flagsArray[@]}"
78
+
echoCmd 'waf install flags' "${flagsArray[@]}"
79
79
python "$wafPath" "${flagsArray[@]}"
80
80
81
81
runHook postInstall