fontconfig: fix etc priority
This commit is contained in:
committed by
Nikolay Amiantov
parent
edb9416228
commit
cd2948a72e
@@ -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 \
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user