diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index a03f7446b0ab..ff0d95ba4451 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -4,7 +4,7 @@ let fontconfig_ = fontconfig; in
{
fontconfig ? fontconfig_
# an array of fonts, e.g. `[ pkgs.dejavu_fonts.minimal ]`
-, fontDirectories
+ , fontDirectories
, impureFontDirectories ? [
# nix user profile
"~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts"
@@ -18,19 +18,23 @@ let fontconfig_ = fontconfig; in
++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ]
# nix default profile
++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ]
+
+ # to include custom config
+ , includes ? ["/etc/fonts/conf.d"]
}:
runCommand "fonts.conf"
{
nativeBuildInputs = [ libxslt ];
buildInputs = [ fontconfig ];
- inherit fontDirectories;
+ inherit fontDirectories includes;
# Add a default font for non-nixos systems, <1MB and in nixos defaults.
impureFontDirectories = impureFontDirectories ++ [ dejavu_fonts.minimal ];
}
''
xsltproc --stringparam fontDirectories "$fontDirectories" \
--stringparam impureFontDirectories "$impureFontDirectories" \
+ --stringparam includes "$includes" \
--path ${fontconfig.out}/share/xml/fontconfig \
${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \
> $out
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index d04e4ffab967..aafa9345c87c 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -16,6 +16,7 @@
+
@@ -30,8 +31,10 @@
- /etc/fonts/conf.d
-
+
+
+
+
fonts