public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing)

Browse Source 
svn path=/nixpkgs/trunk/; revision=34239
This commit is contained in:
Lluís Batlle i Rossell 2012-05-25 08:15:41 +00:00
parent c5b6f8a374
commit c0be42fd68
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc/2.13/common.nix
View File

@ -112,7 +112,9 @@ stdenv.mkDerivation ({
] ++ stdenv.lib.optionals (cross != null) [ ] ++ stdenv.lib.optionals (cross != null) [
(if cross.withTLS then "--with-tls" else "--without-tls") (if cross.withTLS then "--with-tls" else "--without-tls")
(if cross.float == "soft" then "--without-fp" else "--with-fp") (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" "--enable-kernel=2.6.0"
"--with-__thread" "--with-__thread"
] ++ stdenv.lib.optionals stdenv.isArm [ ] ++ stdenv.lib.optionals stdenv.isArm [