From 93a7450c6a3987cee67a28efc3e1e51318a8d166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Aug 2012 10:04:07 +0200 Subject: [PATCH] glibc: fixing the glibcLocales build It was stopping hydra from evaluating further, I think. I broke it in my previous commit. --- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 5db9e08e3f92..6e409158f0b8 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ stdenv.lib.optionals (cross == null) [ + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ "--enable-kernel=${kernelHeaders.versionForGlibc}" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls")