diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-10 11:18:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-10 11:18:50 +0200 |
| commit | e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0 (patch) | |
| tree | 1b8f8a1995bfed37f6ad667a62acc2ea9e62932c | |
| parent | c30b12b9a5cc35b658e65b3ff54e9c877f1380ad (diff) | |
| download | nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar.gz nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar.bz2 nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar.lz nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar.xz nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.tar.zst nixlib-e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0.zip | |
glibc: apply the i686 patch only on i686
... to reduce rebuilding. /cc #23177.
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3d146c543987..66510919e34f 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -48,9 +48,8 @@ stdenv.mkDerivation ({ "/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 - - ./fix-i686-memchr.patch - ]; + ] + ++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch; postPatch = # Needed for glibc to build with the gnumake 3.82 |