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

waf: only add crossFlags when hostPlatform.system == targetPlatform

Browse Source 
waf fails otherwise in some weird CHECK_UNAME things

Fixes #62540
This commit is contained in:
Matthew Bauer 2019-06-03 12:23:02 -04:00
parent 9f7bb1f512
commit 6c9977f753
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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