From ef43e6fc1851f06a467799bb192a38f3b95f95bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 8 Feb 2010 15:28:05 +0000 Subject: [PATCH] Making the cross-stdenv not to be used unless cross-compiling. This way, no "hostDrv" or "buildDrv" attributes are added to derivations. svn path=/nixpkgs/trunk/; revision=19866 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c4dbae5713..3bef2ccb7cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -193,7 +193,10 @@ let stdenv = stdenvCross; overrideSetup = overrideSetup; } - else stdenvCross; + else if crossSystem != null then + stdenvCross + else + defaultStdenv; forceBuildDrv = drv : drv // { hostDrv = drv.buildDrv; };