diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-05-10 20:23:45 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-05-10 20:23:45 +0000 |
| commit | e3ccebccec96466761ecedb87c508f4c99a23033 (patch) | |
| tree | 047b65524083168e66bb20c33e1a77d22dd4d10d /pkgs/development/libraries/glibc | |
| parent | 2a6579bdb6837a0e962ef0c37600639312fef02a (diff) | |
| download | nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar.gz nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar.bz2 nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar.lz nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar.xz nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.tar.zst nixlib-e3ccebccec96466761ecedb87c508f4c99a23033.zip | |
GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.
svn path=/nixpkgs/trunk/; revision=34053
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 86004de640a3..536f23fe3bb2 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -75,10 +75,15 @@ stdenv.mkDerivation ({ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch + ] - /* don't use /etc/ld.so.cache, for non-nixos systems */ - ./dont_use_system_ld_so_cache.patch + ++ (stdenv.lib.optional (hurdHeaders == null) + /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently + disabled on GNU/Hurd, which uses a more recent libc snapshot. */ + ./dont_use_system_ld_so_cache.patch ) + + ++ [ /* Without this patch many KDE binaries crash. */ ./glibc-elf-localscope.patch ] ++ stdenv.lib.optional installLocales ./catalan-firstdays.patch; |