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

Merge master into x-updates

Browse Source 
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
This commit is contained in:
Vladimír Čunát
2014-02-04 22:00:09 +01:00
parent 8e4665a634 ec985c8ffa
commit be70104a3a
121 changed files with 3084 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+4 -4
View File
@@ -22,11 +22,11 @@
<fontconfig>
<xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != '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>
<include ignore_missing="yes">/etc/fonts/conf.d</include>
<include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
<cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
<cachedir xml:space="preserve">~/.fontconfig</cachedir>
<cachedir>/var/cache/fontconfig</cachedir>
<cachedir>~/.fontconfig</cachedir>
<xsl:for-each select="str:tokenize($fontDirectories)">
<dir><xsl:value-of select="." /></dir>