mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
glibc: do not use system ld.so.preload (close #1788)
Modified according to the PR comment.
This commit is contained in:
parent
a78f47917a
commit
05068ac554
|
@ -44,6 +44,9 @@ stdenv.mkDerivation ({
|
|||
/* Don't use /etc/ld.so.cache, for non-NixOS systems. */
|
||||
./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
|
||||
compatibility with old NixOS installations (since NixOS used
|
||||
to default to blowfish). */
|
||||
|
|
|
@ -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. */
|
Loading…
Reference in a new issue