From c0be42fd6826a0d75fcfb7d341e3eb07c06c8a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 08:15:41 +0000 Subject: [PATCH] Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing) svn path=/nixpkgs/trunk/; revision=34239 --- pkgs/development/libraries/glibc/2.13/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 [