alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing some conflict on the variable 'cross'.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18357
This commit is contained in:
Lluís Batlle i Rossell 2009-11-15 19:07:21 +00:00
parent 81f695899a
commit d06dce4e42
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/stdenv/generic/default.nix
View file

@ -18,7 +18,7 @@ let
result = result =
derivation { derivation {
inherit system cross name; inherit system name cross;
builder = shell; builder = shell;
@ -53,7 +53,9 @@ let
["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
stdenv = result; stdenv = result;
system = result.system; 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, # The meta attribute is passed in the resulting attribute set,

2
pkgs/stdenv/linux/default.nix
View file

@ -208,7 +208,7 @@ rec {
name = "stdenv-linux" + name = "stdenv-linux" +
stdenvLinuxBoot3Pkgs.lib.optionalString (cross != null) "-${cross}"; stdenvLinuxBoot3Pkgs.lib.optionalString (cross != null) "-${cross}";
inherit system; inherit system cross;
preHook = builtins.toFile "prehook.sh" commonPreHook; preHook = builtins.toFile "prehook.sh" commonPreHook;