public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.

Browse Source 
svn path=/nixpkgs/trunk/; revision=34053
This commit is contained in:
Ludovic Courtès 2012-05-10 20:23:45 +00:00
parent 2a6579bdb6
commit e3ccebccec
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/glibc/2.13/common.nix
View File

@ -75,10 +75,15 @@ stdenv.mkDerivation ({
/* Allow nixos and nix handle the locale-archive. */ /* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch ./nix-locale-archive.patch
]
/* don't use /etc/ld.so.cache, for non-nixos systems */ ++ (stdenv.lib.optional (hurdHeaders == null)
./dont_use_system_ld_so_cache.patch
/* 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. */ /* Without this patch many KDE binaries crash. */
./glibc-elf-localscope.patch ./glibc-elf-localscope.patch
] ++ stdenv.lib.optional installLocales ./catalan-firstdays.patch; ] ++ stdenv.lib.optional installLocales ./catalan-firstdays.patch;