diff options
| author | Shaun Sharples <shaun.sharples@gmail.com> | 2014-11-26 16:56:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-26 17:11:44 +0100 |
| commit | 61d7fb934b0e356cd108afcd293c09837efcc6bf (patch) | |
| tree | 61b770707b0fc1ae7954d8de0affff418a28e457 /pkgs/development/libraries/fontconfig/default.nix | |
| parent | 1dd53cc9903d394117bbc70ef043cb7054543d95 (diff) | |
| download | nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar.gz nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar.bz2 nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar.lz nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar.xz nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.tar.zst nixpkgs-61d7fb934b0e356cd108afcd293c09837efcc6bf.zip | |
fontconfig: avoid questionmark in patch name on darwin
Close #5135. @vcunat made this conditional to avoid rebuild for now.
Diffstat (limited to 'pkgs/development/libraries/fontconfig/default.nix')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 72906232eff..bb8289b661e 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; |