From 61d7fb934b0e356cd108afcd293c09837efcc6bf Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Wed, 26 Nov 2014 16:56:49 +0200 Subject: [PATCH] fontconfig: avoid questionmark in patch name on darwin Close #5135. @vcunat made this conditional to avoid rebuild for now. --- pkgs/development/libraries/fontconfig/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 72906232eff9..bb8289b661ee 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -32,10 +32,13 @@ stdenv.mkDerivation rec { ; patches = [ - (fetchpatch { - url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67"; - sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv"; - }) + (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 + } + )) (substituteAll { src = ./config-compat.patch; inherit configVersion;