diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-16 23:21:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-16 23:21:13 +0000 |
| commit | 2c7fa189fb2ac1c4ef689398ab13a4465448856a (patch) | |
| tree | a20b6c0b65d6516b667ab3709960ae6f3ccfa2ba /pkgs/development/libraries/glibc-2.9/default.nix | |
| parent | d82c7e0a69d186b3c83736fd5c2aed7b12a3f7dc (diff) | |
| download | nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar.gz nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar.bz2 nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar.lz nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar.xz nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.tar.zst nixpkgs-2c7fa189fb2ac1c4ef689398ab13a4465448856a.zip | |
Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
Diffstat (limited to 'pkgs/development/libraries/glibc-2.9/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.9/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix index ff47696e20b..9f02fa33e0d 100644 --- a/pkgs/development/libraries/glibc-2.9/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "glibc-2.9" + - stdenv.lib.optionalString (cross != null) "-${cross}"; + stdenv.lib.optionalString (cross != null) "-${cross.config}"; builder = ./builder.sh; @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; }; - inherit kernelHeaders installLocales cross; + inherit kernelHeaders installLocales; + crossConfig = if (cross != null) then cross.config else null; inherit (stdenv) is64bit; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { "--with-headers=${kernelHeaders}/include" (if profilingLibraries then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross != null) [ - "--host=${cross}" + "--host=${cross.config}" "--build=${stdenv.system}" "--with-tls" "--enable-kernel=2.6.0" |