summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-08-13 20:36:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-08-13 20:56:43 +0200
commit0a4a62459ac97d29e95d751771223e772a6fa4d6 (patch)
tree92f7542f82afc98f372c342cdc173de23c8ef653 /nixos
parentd5f6cce7f2840d90c100f1e8f8b720b37a198767 (diff)
nixos/fontconfig: Reintroduce unversioned fonts.conf
Turns out lot of software (including Chromium) use bundled fontconfig so we either need to wrap every one of those, or re-introduce the global unversioned config. The latter is easier but weakens hermetic configs. But perhaps those are not really worth the effort.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 12a40fbb5a27..846430194716 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -182,6 +182,9 @@ let
# fonts.conf
ln -s ${pkg.out}/etc/fonts/fonts.conf \
$dst/../fonts.conf
+ # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged
+ ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \
+ $out/etc/fonts/fonts.conf
# fontconfig default config files
ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \