Author: viric
Date: Fri May 25 08:15:41 2012
New Revision: 34239
URL: https://nixos.org/websvn/nix/?rev=34239&sc=1
Log:
Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing)
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Fri May
25 08:09:25 2012 (r34238)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Fri May
25 08:15:41 2012 (r34239)
@@ -112,7 +112,9 @@
] ++ 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 [
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
