Skip to content

Commit

Permalink
fontconfig: stop using xml:space; vital for nixos+2.11
Browse files Browse the repository at this point in the history
This is a proper fix for problems described in ec985c8 .
The code is from @lethalman.
  • Loading branch information
vcunat committed Sep 28, 2014
1 parent a1b7743 commit b16994f
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<xsl:template match="/fontconfig">

<fontconfig>
<xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
<xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />

<include ignore_missing="yes">/etc/fonts/conf.d</include>
<include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
Expand All @@ -40,4 +40,12 @@

</xsl:template>


<!-- New fontconfig >=2.11 doesn't like xml:space added by xsl:copy-of -->
<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates select="node()|@*[name() != 'xml:space']"/>
</xsl:copy>
</xsl:template>

</xsl:stylesheet>

0 comments on commit b16994f

Please sign in to comment.