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

glibc: add "/run/current-system/sw/bin" to the default search path returned by "getconf CS_PATH"

This commit is contained in:
Peter Simons 2013-06-03 22:16:05 +02:00
parent 2a0479fc48
commit aa2044099d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc/2.17/common.nix
View File

@ -55,6 +55,11 @@ stdenv.mkDerivation ({
rfc3484_sort: Assertion `src->results[i].native == -1 || rfc3484_sort: Assertion `src->results[i].native == -1 ||
src->results[i].native == a2_native' failed." crashes. */ src->results[i].native == a2_native' failed." crashes. */
./glibc-rh739743.patch ./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 = '' postPatch = ''

6
pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch Normal file
View File

@ -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"