diff options
| author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-07-17 05:11:42 +0900 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-20 03:21:05 +0300 |
| commit | cd2948a72e3116a3a42f1f523fe2638db994362c (patch) | |
| tree | 99141aa627a249338ead58ced4148db88c733a38 /pkgs/development/libraries/fontconfig | |
| parent | edb9416228a1c1087313ef52da375f8dd36c6ea4 (diff) | |
| download | nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar.gz nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar.bz2 nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar.lz nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar.xz nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.tar.zst nixpkgs-cd2948a72e3116a3a42f1f523fe2638db994362c.zip | |
fontconfig: fix etc priority
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 6acf1ebce29..f18ea5948f1 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { cd "$out/etc/fonts" rm conf.d/{50-user,51-local}.conf "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ - --stringparam fontconfig "$out" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index b59fcd0187b..dddbbe9e516 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -28,8 +28,6 @@ <!-- /var/cache/fontconfig is useful for non-nixos systems --> <cachedir>/var/cache/fontconfig</cachedir> - <!-- fontconfig distribution conf.d --> - <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include> <!-- versioned system-wide config --> <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include> |