diff options
Diffstat (limited to 'pkgs/development/libraries/glibc/2.18/common.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.18/common.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/2.18/common.nix b/pkgs/development/libraries/glibc/2.18/common.nix index 9271e33cf07b..518615b1739a 100644 --- a/pkgs/development/libraries/glibc/2.18/common.nix +++ b/pkgs/development/libraries/glibc/2.18/common.nix @@ -56,14 +56,20 @@ stdenv.mkDerivation ({ ./scanf.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 + + ./cve-2012-4412+4424.patch ./cve-2013-4237.patch ./cve-2013-4332.patch ./cve-2013-4458.patch ./cve-2013-4788.patch - ] - # the problem only seems to affect i686, so avoid re-hash x86_64 ATM - ++ stdenv.lib.optional stdenv.isi686 ./strstr-sse42-hack.patch; + + ./strstr-sse42-hack.patch + ]; postPatch = '' # Needed for glibc to build with the gnumake 3.82 |