From e47ac55a21ce5b7c4b9e7e3a068fb5823a2cb5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Apr 2017 11:18:13 +0200 Subject: [PATCH] glibc: apply the i686 patch only on i686 ... to reduce rebuilding. /cc #23177. --- pkgs/development/libraries/glibc/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3d146c54398..66510919e34 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