diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-03 02:09:28 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-06 10:41:28 -0300 |
commit | b3a1dd846972cd27fe3a3d27db91a14f2ecaa7ca (patch) | |
tree | 2712e05e84546698f37b05a1b17c14d4a57bc957 | |
parent | e24107b347885af86928e0c1eb5c1c3b4d16e17e (diff) |
waf: prefix all setup-hook variables with `waf`
Standardizing the behaviour of commit a79a8f29bc509b2d51158846c9562e64e1239b4c.
-rw-r--r-- | pkgs/development/tools/build-managers/waf/hook.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/waf/setup-hook.sh | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/tools/build-managers/waf/hook.nix b/pkgs/development/tools/build-managers/waf/hook.nix index 7282ed9ebf97c..ac497d2278314 100644 --- a/pkgs/development/tools/build-managers/waf/hook.nix +++ b/pkgs/development/tools/build-managers/waf/hook.nix @@ -13,7 +13,7 @@ makeSetupHook { # waf is not inserted into propagatedBuildInputs, rather it is inserted # directly inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) + wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index 2593b0a9d8088..d3e2bf97e6823 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -19,14 +19,14 @@ wafConfigurePhase() { local flagsArray=( $prefixFlag $wafConfigureFlags "${wafConfigureFlagsArray[@]}" - ${configureTargets:-configure} + ${wafConfigureTargets:-configure} ) if [ -z "${dontAddWafCrossFlags:-}" ]; then - flagsArray+=(@crossFlags@) + flagsArray+=(@wafCrossFlags@) fi - echoCmd 'configure flags' "${flagsArray[@]}" + echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then @@ -51,11 +51,11 @@ wafBuildPhase () { local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} $wafFlags ${wafFlagsArray[@]} - $buildFlags ${buildFlagsArray[@]} - ${buildTargets:-build} + $wafBuildFlags ${wafBuildFlagsArray[@]} + ${wafBuildTargets:-build} ) - echoCmd 'build flags' "${flagsArray[@]}" + echoCmd 'waf build flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postBuild @@ -71,11 +71,11 @@ wafInstallPhase() { local flagsArray=( ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} $wafFlags ${wafFlagsArray[@]} - $installFlags ${installFlagsArray[@]} - ${installTargets:-install} + $wafInstallFlags ${wafInstallFlagsArray[@]} + ${wafInstallTargets:-install} ) - echoCmd 'install flags' "${flagsArray[@]}" + echoCmd 'waf install flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postInstall |