Merge branch 'master' into staging

Conflicts: pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
parent 43c4d78bc6 ad4ad11fbc
commit 4aa3eec330
299 changed files with 22706 additions and 13278 deletions
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -24,11 +24,12 @@ stdenv.mkDerivation rec {
  };

  patches = [
-    (fetchpatch {
-      name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild
-      url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
-      sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
-    })
+    (fetchpatch ({
+        url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
+        sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
+        name = "fc-cache-bug-77252.patch";
+      }
+    ))
    (substituteAll {
      src = ./config-compat.patch;
      inherit configVersion;