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

glibc: do not use system ld.so.preload (close #1788)

Browse Source 
Modified according to the PR comment.
This commit is contained in:
Ian-Woo Kim 2014-02-19 01:44:33 +01:00 committed by Vladimír Čunát
parent a78f47917a
commit 05068ac554
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc/2.19/common.nix
View File

@ -44,6 +44,9 @@ stdenv.mkDerivation ({
/* Don't use /etc/ld.so.cache, for non-NixOS systems. */ /* Don't use /etc/ld.so.cache, for non-NixOS systems. */
./dont-use-system-ld-so-cache.patch ./dont-use-system-ld-so-cache.patch
/* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload. */
./dont-use-system-ld-so-preload.patch
/* Add blowfish password hashing support. This is needed for /* Add blowfish password hashing support. This is needed for
compatibility with old NixOS installations (since NixOS used compatibility with old NixOS installations (since NixOS used
to default to blowfish). */ to default to blowfish). */

12
pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rupN a/elf/rtld.c b/elf/rtld.c
--- a/elf/rtld.c 2013-08-11 00:52:55.000000001 +0200
+++ b/elf/rtld.c 2014-02-18 13:56:19.000000001 +0100
@@ -1639,7 +1639,7 @@ ERROR: ld.so: object '%s' cannot be load
open(). So we do this first. If it succeeds we do almost twice
the work but this does not matter, since it is not for production
use. */
- static const char preload_file[] = "/etc/ld.so.preload";
+ static const char preload_file[] = "/etc/ld-nix.so.preload";
if (__builtin_expect (__access (preload_file, R_OK) == 0, 0))
{
/* Read the contents of the file. */