diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-05-25 08:15:41 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-05-25 08:15:41 +0000 |
commit | c0be42fd6826a0d75fcfb7d341e3eb07c06c8a37 (patch) | |
tree | bacd934b1da6feb65580f92ed72a48a6e267e2b1 /pkgs | |
parent | c5b6f8a374fd0100e174919dca9bba3d465f91fd (diff) |
Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing)
svn path=/nixpkgs/trunk/; revision=34239
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index d0179b68ebcf..4058ed3d3021 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -112,7 +112,9 @@ stdenv.mkDerivation ({ ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ stdenv.lib.optionals (cross != null && cross.platform.kernelMajor == "2.6") [ + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals stdenv.isArm [ |