From 61417a05c7c65cb8f7d9ff2bd8d9cedeb66649b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Feb 2010 07:43:36 +0000 Subject: [PATCH] Removing a dependency on stdenvCross: there was a .buildDrv mentioned when there was no cross build planned. svn path=/nixpkgs/trunk/; revision=19871 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb6ada9a0b95..54decba6c068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -198,7 +198,8 @@ let else defaultStdenv; - forceBuildDrv = drv : drv // { hostDrv = drv.buildDrv; }; + forceBuildDrv = drv : if (crossSystem == null) then drv else + (drv // { hostDrv = drv.buildDrv; }); # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's