From 6c9977f753698f23e505441038d0077420bc2757 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 3 Jun 2019 12:23:02 -0400 Subject: waf: only add crossFlags when hostPlatform.system == targetPlatform waf fails otherwise in some weird CHECK_UNAME things Fixes #62540 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') 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; -- cgit 1.4.1