From 3ef186bdb415ba9324d461ff0c182d1e97c7a3d2 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 26 Nov 2014 22:03:45 +0100
Subject: fontconfig: drop infinality (for now), close #5140

Also the simplify the expression when we rebuild anyway.
---
 pkgs/development/libraries/fontconfig/default.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'pkgs/development/libraries/fontconfig/default.nix')

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index bb8289b661e..158c3dcf07d 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -23,22 +23,12 @@ stdenv.mkDerivation rec {
     sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw";
   };
 
-  infinality_patch =
-    let subvers = "1";
-      in fetchurl {
-        url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
-        sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
-      }
-    ;
-
   patches = [
-    (fetchpatch ({
-        url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
-        sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
-      } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-        name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild
-      }
-    ))
+    (fetchpatch {
+      name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild
+      url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
+      sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
+    })
     (substituteAll {
       src = ./config-compat.patch;
       inherit configVersion;
@@ -72,7 +62,7 @@ stdenv.mkDerivation rec {
   installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
 
   postInstall = ''
-    cd "$out/etc/fonts" && tar xvf ${infinality_patch}
+    cd "$out/etc/fonts"
     rm conf.d/{50-user,51-local}.conf
     "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
       --stringparam fontconfig "$out" \
-- 
cgit 1.4.1