diff options
| author | obadz <obadz-git@obadz.com> | 2016-07-15 20:43:42 +0200 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-07-15 20:44:21 +0200 |
| commit | cfc0a5415b935fb50241ab1b571771c2f793695c (patch) | |
| tree | fc7abf4e1557dd62be28154c561d096399e522d6 /pkgs/development/libraries/fontconfig | |
| parent | 1b0e82d6ff86e4f9f072a16a71d443c2bea75633 (diff) | |
| download | nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar.gz nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar.bz2 nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar.lz nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar.xz nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.tar.zst nixpkgs-cfc0a5415b935fb50241ab1b571771c2f793695c.zip | |
Revert "fontconfig: fix etc priority"
This reverts commit 1e53d4a7776acbf61f42c094c103652c8068ad64. Closes #16983 cc @vcunat @ericsagnes @dezgeg
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, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f18ea5948f1..6acf1ebce29 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -68,6 +68,7 @@ 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 dddbbe9e516..b59fcd0187b 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -28,6 +28,8 @@ <!-- /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> |