glibc: apply the i686 patch only on i686

... to reduce rebuilding. /cc #23177.
2017-04-10 11:18:13 +02:00 · 2017-04-10 11:18:13 +02:00 · e47ac55a21
commit e47ac55a21
parent c30b12b9a5
1 changed files with 2 additions and 3 deletions
--- 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