nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 18:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

waf: prefix all setup-hook variables with waf

Browse Source 
Standardizing the behaviour of commit a79a8f29bc.
This commit is contained in:
Anderson Torres 2023-09-03 02:09:28 -03:00
parent e24107b347
commit b3a1dd8469
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/build-managers/waf/hook.nix
View File

@ -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}"'';
};

18
pkgs/development/tools/build-managers/waf/setup-hook.sh
View File

@ -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