diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 12:23:02 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 12:28:29 -0400 |
| commit | 6c9977f753698f23e505441038d0077420bc2757 (patch) | |
| tree | 9d14e4908ce7e924ecb6d56b8e366696bf943f9b /pkgs | |
| parent | 9f7bb1f512ba305ed5b0bf0132dd3f50b158a517 (diff) | |
waf: only add crossFlags when hostPlatform.system == targetPlatform
waf fails otherwise in some weird CHECK_UNAME things Fixes #62540
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af78b9f552d3..731cdb9b1483b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6716,7 +6716,7 @@ in deps = [ python ]; substitutions = { 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}"''; }; } ../development/tools/build-managers/waf/setup-hook.sh; |