Author: ludo
Date: Thu May 10 20:23:45 2012
New Revision: 34053
URL: https://nixos.org/websvn/nix/?rev=34053&sc=1
Log:
GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Thu May
10 19:29:54 2012 (r34052)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Thu May
10 20:23:45 2012 (r34053)
@@ -75,10 +75,15 @@
/* 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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
