diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-28 16:46:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-28 16:57:47 +0200 |
| commit | b16994f7ce49ac1793837879f8e3ddc63c976a5f (patch) | |
| tree | f71642898a4cdd02e39c55f95dbc884e31cfb780 /pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | |
| parent | a1b7743b52212d4170a7413484fe736d8847228c (diff) | |
| download | nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar.gz nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar.bz2 nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar.lz nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar.xz nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.tar.zst nixpkgs-b16994f7ce49ac1793837879f8e3ddc63c976a5f.zip | |
fontconfig: stop using xml:space; vital for nixos+2.11
This is a proper fix for problems described in ec985c8ffa6d29 . The code is from @lethalman.
Diffstat (limited to 'pkgs/development/libraries/fontconfig/make-fonts-conf.xsl')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index 59071ce9e22..e3938663c9b 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -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> @@ -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> |