From d15811bf78eda2aacfa5274822ba07a911d9bca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 20 May 2010 12:33:55 +0000 Subject: [PATCH] Trying to fix stdenv updates build (I broke glibc at the merge resolution I did with it in the last update from trunk) svn path=/nixpkgs/branches/stdenv-updates/; revision=21919 --- pkgs/development/libraries/glibc-2.11/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix index 30e26326d37..e7e9738140a 100644 --- a/pkgs/development/libraries/glibc-2.11/common.nix +++ b/pkgs/development/libraries/glibc-2.11/common.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; - patches = + patches = stdenv.lib.optional (fetchgit == null) /* Fix for NIXPKGS-79: when doing host name lookups, when nsswitch.conf contains a line like @@ -52,14 +52,13 @@ stdenv.mkDerivation ({ does work because "status" will contain UNAVAIL after the failure to find mdns4_minimal. */ ./nss-skip-unavail.patch - + ++ [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch /* Make sure `nscd' et al. are linked against `libssp'. */ ./stack-protector-link.patch ] - ++ stdenv.lib.optional (fetchgit == null) /* MOD_NANO definition, for ntp (taken from glibc upstream) */ ./mod_nano.patch;