diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index dddbbe9e516..ed51b62a1d0 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -12,11 +12,9 @@ extension-element-prefixes="str" > - <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" /> + <xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" /> <xsl:param name="fontDirectories" /> - <xsl:param name="fontconfig" /> - <xsl:param name="fontconfigConfigVersion" /> <xsl:template match="/fontconfig"> @@ -28,8 +26,8 @@ <!-- /var/cache/fontconfig is useful for non-nixos systems --> <cachedir>/var/cache/fontconfig</cachedir> - <!-- versioned system-wide config --> - <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include> + <!-- system-wide config --> + <include ignore_missing="yes">/etc/fonts/conf.d</include> <dir prefix="xdg">fonts</dir> <xsl:for-each select="str:tokenize($fontDirectories)"> @@ -40,6 +38,11 @@ <!-- nix user profile --> <dir>~/.nix-profile/lib/X11/fonts</dir> <dir>~/.nix-profile/share/fonts</dir> + + <!-- FHS paths for non-NixOS platforms --> + <dir>/usr/share/fonts</dir> + <dir>/usr/local/share/fonts</dir> + <!-- nix default profile --> <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir> <dir>/nix/var/nix/profiles/default/share/fonts</dir> |