From b16994f7ce49ac1793837879f8e3ddc63c976a5f Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 28 Sep 2014 16:46:26 +0200
Subject: 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.
---
 pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 59071ce9e22af..e3938663c9b47 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>
-- 
cgit 1.4.1