diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-04 20:02:51 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-04 21:58:19 +0100 |
| commit | ec985c8ffa6d29bf50e60ba814e3523ffd4c2919 (patch) | |
| tree | 4163ed7cc53e407e871a141f61d0d8fb116910ba /pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | |
| parent | a598b6247489a7b6c322908e4cb1eff78db5c672 (diff) | |
| download | nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar.gz nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar.bz2 nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar.lz nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar.xz nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.tar.zst nixpkgs-ec985c8ffa6d29bf50e60ba814e3523ffd4c2919.zip | |
fontconfig: stop using xml:space; vital for nixos+2.11
Since fontconfig-2.11 the xml:space attribute makes it reject /etc/fonts/fonts.conf, so it renders garbage and eats lots of CPU. To use anything linked to fontconfig-2.11 you need to have this patch applied to your running NixOS. That's why I'm pushing it to master before the fontconfig update (as soon as I found and tested the fix).
Diffstat (limited to 'pkgs/development/libraries/fontconfig/make-fonts-conf.xsl')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index 68c91596ac5..073e4165931 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -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> |