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

glibc: apply the i686 patch only on i686

Browse Source 
... to reduce rebuilding. /cc #23177.
This commit is contained in:
Vladimír Čunát 2017-04-10 11:18:13 +02:00
parent c30b12b9a5
commit e47ac55a21
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,9 +48,8 @@ stdenv.mkDerivation ({
"/bin:/usr/bin", which is inappropriate on NixOS machines. This "/bin:/usr/bin", which is inappropriate on NixOS machines. This
patch extends the search path by "/run/current-system/sw/bin". */ patch extends the search path by "/run/current-system/sw/bin". */
./fix_path_attribute_in_getconf.patch ./fix_path_attribute_in_getconf.patch
]
./fix-i686-memchr.patch ++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch;
];
postPatch = postPatch =
# Needed for glibc to build with the gnumake 3.82 # Needed for glibc to build with the gnumake 3.82