diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-15 19:07:21 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-15 19:07:21 +0000 |
commit | d06dce4e42ef63b6f0ca3cc8c15a246164be957a (patch) | |
tree | 33843180c4967b0d9c195a963cb29c7b2f16a173 /pkgs/stdenv | |
parent | 81f695899a642508bf7a600573e2090b46e6b2a4 (diff) | |
download | nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar.gz nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar.bz2 nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar.lz nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar.xz nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.tar.zst nixlib-d06dce4e42ef63b6f0ca3cc8c15a246164be957a.zip |
Fixing some conflict on the variable 'cross'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18357
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b1afe060b73a..29cbb0de410c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -18,7 +18,7 @@ let result = derivation { - inherit system cross name; + inherit system name cross; builder = shell; @@ -53,7 +53,9 @@ let ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; stdenv = result; system = result.system; - cross = result.cross; + # The env variable 'cross' is used in all the crosscompiler + # bootstrapping in another sense + crossTarget = result.cross; }) ) # The meta attribute is passed in the resulting attribute set, diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 87df78fafb4d..228c626341ef 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -208,7 +208,7 @@ rec { name = "stdenv-linux" + stdenvLinuxBoot3Pkgs.lib.optionalString (cross != null) "-${cross}"; - inherit system; + inherit system cross; preHook = builtins.toFile "prehook.sh" commonPreHook; |