diff options
author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-03-20 11:43:50 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-20 11:43:50 -0500 |
commit | 1b0d9e9ae64b677c09f345f740f5a94fa41eb468 (patch) | |
tree | 1cbb71acfb427c9521ea4552853692898ee755c4 /pkgs/development/libraries/fontconfig/2.10.nix | |
parent | 48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855 (diff) | |
parent | d458b5401a36dd87cfd2bd071f634330f095cf5d (diff) | |
download | nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar.gz nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar.bz2 nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar.lz nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar.xz nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.tar.zst nixlib-1b0d9e9ae64b677c09f345f740f5a94fa41eb468.zip |
Merge pull request #23819 from ttuegel/freetype
FreeType 2.7.1 and Fontconfig defaults
Diffstat (limited to 'pkgs/development/libraries/fontconfig/2.10.nix')
-rw-r--r-- | pkgs/development/libraries/fontconfig/2.10.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 2705339adbfb..222dfc27256c 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -8,13 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - 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 = [ + # FreeType 2.7 prefixes PCF font family names with the foundry name. + # The output of fc-list and fc-query change which breaks the tests. + ./test-pcf-family-names-freetype-2.7.patch + ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config @@ -44,10 +42,6 @@ stdenv.mkDerivation rec { # Don't try to write to /var/cache/fontconfig at install time. installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; - postInstall = '' - cd "$out/etc/fonts" && tar xvf ${infinality_patch} - ''; - passthru = { # Empty for backward compatibility, there was no versioning before 2.11 configVersion = ""; |