From 989c58eb2966b1cdcfd93b406e1525966845aa00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Jun 2013 13:31:35 +0200
Subject: [PATCH] Process /etc/fonts/conf.d before upstream fonts/conf.d

Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
---
 .../libraries/fontconfig/make-fonts-conf.xsl           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index f716700d98e3..68c91596ac5f 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -22,19 +22,19 @@
     <fontconfig>
       <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
-      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
       <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
-      
+      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+
       <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
       <cachedir xml:space="preserve">~/.fontconfig</cachedir>
-      
+
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
       </xsl:for-each>
-      
+
     </fontconfig>
 
   </xsl:template>
-  
+
 </xsl:stylesheet>