From 9b55a5c178b74157137b3fcc6b2dd61723b11354 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2008 14:35:02 +0000
Subject: [PATCH] * Generation of /etc/fonts/fonts.conf: moved to Nixpkgs.

svn path=/nixos/trunk/; revision=12252
---
 etc/default.nix               | 14 +++---------
 etc/fonts/make-fonts-conf.xsl | 40 -----------------------------------
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 etc/fonts/make-fonts-conf.xsl

diff --git a/etc/default.nix b/etc/default.nix
index e9de343f9c3b..bee21c697667 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -174,17 +174,9 @@ import ../helpers/make-etc.nix {
   # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
   ++ optional config.fonts.enableFontConfig {
-    source = pkgs.runCommand "fonts.conf"
-      { 
-        fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-        buildInputs = [pkgs.libxslt];
-        inherit (pkgs) fontconfig;
-      }
-      "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
-          --stringparam fontconfig \"$fontconfig\" \\
-          ${./fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
-          > $out
-      ";
+    source = pkgs.makeFontsConf {
+      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
+    };
     target = "fonts/fonts.conf";
   }
 
diff --git a/etc/fonts/make-fonts-conf.xsl b/etc/fonts/make-fonts-conf.xsl
deleted file mode 100644
index f716700d98e3..000000000000
--- a/etc/fonts/make-fonts-conf.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  This script copies the original fonts.conf from the fontconfig
-  distribution, but replaces all <dir> entries with the directories
-  specified in the $fontDirectories parameter.
--->
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:str="http://exslt.org/strings"
-                extension-element-prefixes="str"
-                >
-
-  <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
-
-  <xsl:param name="fontDirectories" />
-  <xsl:param name="fontconfig" />
-
-  <xsl:template match="/fontconfig">
-
-    <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>
-      
-      <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>