public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-08-02 18:30:53 +02:00
parent d239d24a89 4fb87e91ff
commit 625f40151b
829 changed files with 16817 additions and 13395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+5 -5
View File
@@ -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>