public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wafHook: cross compilation support

Browse Source 
for this to work, wafHook must be in nativeBuildInputs.
This commit is contained in:
Symphorien Gibol 2019-03-28 20:02:08 +01:00
parent 1001d0034c
commit 3d60a00c63
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ wafConfigurePhase() {
configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
fi fi
local flagsArray=(); local flagsArray=(@crossFlags@);
for flag in $configureFlags "${configureFlagsArray[@]}"; for flag in $configureFlags "${configureFlagsArray[@]}";
do do
if [[ if [[

6
pkgs/top-level/all-packages.nix
View File

@ -6366,7 +6366,11 @@ in
waf = callPackage ../development/tools/build-managers/waf { python = python3; }; waf = callPackage ../development/tools/build-managers/waf { python = python3; };
wafHook = makeSetupHook { wafHook = makeSetupHook {
deps = [ python ]; deps = [ python ];
substitutions = { inherit waf; }; substitutions = {
inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
};
} ../development/tools/build-managers/waf/setup-hook.sh; } ../development/tools/build-managers/waf/setup-hook.sh;
wakelan = callPackage ../tools/networking/wakelan { }; wakelan = callPackage ../tools/networking/wakelan { };