Re-revert "Merge: glibc: 2.24 -> 2.25"

This reverts commit 55cc7700e9. I hope most problems have been solved. /cc #22874.
2017-02-20 21:16:41 +01:00
parent 0ff2179e0f
commit 09d02f72f6
4 changed files with 16 additions and 5 deletions
@@ -28,7 +28,17 @@ stdenv.mkDerivation rec {
      src = ./config-compat.patch;
      inherit configVersion;
    })
+    (fetchpatch {
+      name = "glibc-2.25.diff";
+      url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
+      sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
+    })
  ];
+  # additionally required for the glibc-2.25 patch; avoid requiring gperf
+  postPatch = ''
+    sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
+    touch src/*
+  '';

  outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config