diff options
| author | Peter Simons <simons@cryp.to> | 2013-06-03 22:16:05 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-06-03 22:16:05 +0200 |
| commit | aa2044099d33b62f0d194d46264c0be3de06bea0 (patch) | |
| tree | 7d9ec9d662027c0a611e3950cad7f589fe9e7c32 /pkgs/development/libraries/glibc | |
| parent | 2a0479fc4817b9dee1c153e646d87cb9799073e2 (diff) | |
| download | nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar.gz nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar.bz2 nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar.lz nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar.xz nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.tar.zst nixlib-aa2044099d33b62f0d194d46264c0be3de06bea0.zip | |
glibc: add "/run/current-system/sw/bin" to the default search path returned by "getconf CS_PATH"
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.17/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index 23ec1c46ad7b..1bc439b5e9b6 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -55,6 +55,11 @@ stdenv.mkDerivation ({ rfc3484_sort: Assertion `src->results[i].native == -1 || src->results[i].native == a2_native' failed." crashes. */ ./glibc-rh739743.patch + + /* The command "getconf CS_PATH" returns the default search path + "/bin:/usr/bin", which is inappropriate on NixOS machines. This + patch extends the search path by "/run/current-system/sw/bin". */ + ./fix_path_attribute_in_getconf.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch new file mode 100644 index 000000000000..714e49db5607 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch @@ -0,0 +1,6 @@ +diff -ubr glibc-2.17-orig/sysdeps/unix/confstr.h glibc-2.17/sysdeps/unix/confstr.h +--- glibc-2.17-orig/sysdeps/unix/confstr.h 2013-06-03 22:01:44.829726968 +0200 ++++ glibc-2.17/sysdeps/unix/confstr.h 2013-06-03 22:04:39.469376740 +0200 +@@ -1 +1 @@ +-#define CS_PATH "/bin:/usr/bin" ++#define CS_PATH "/run/current-system/sw/bin:/bin:/usr/bin" |