summary refs log tree commit diff
path: root/pkgs/stdenv/generic/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
-rw-r--r--pkgs/stdenv/generic/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 29cbb0de410..a8eab154db4 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -18,7 +18,7 @@ let
     result =
 
       derivation {
-        inherit system name cross;
+        inherit system name;
 
         builder = shell;
 
@@ -55,7 +55,7 @@ let
               system = result.system;
               # The env variable 'cross' is used in all the crosscompiler
               # bootstrapping in another sense
-              crossTarget = result.cross;
+              crossTarget = if (cross != null) then cross.config else null;
             })
           )
           # The meta attribute is passed in the resulting attribute set,