summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-10-06 08:52:39 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-10-11 17:45:58 +0000
commit36d4e5385927e2cc02116bb69bf4033c0f0f2f24 (patch)
treeb7ba7b17a6a804d2d692db27bd21f83d9379c05c
parentMerge pull request #140863 from mohe2015/security/wordpress/5.7.3 (diff)
downloadnixpkgs-origin/backport-140723-to-release-21.05.tar.gz
nixos/fontdir: always link the font directoryorigin/backport-140723-to-release-21.05
This fixes the fonts directory availability when not running an xserver, such as headless machines. (cherry picked from commit a27dc95e72b5671df59e04853aa48a50d65f2031)
-rw-r--r--nixos/modules/config/fonts/fontdir.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index c4bd3a077d33..db4b6c638ab4 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -50,9 +50,8 @@ in
config = mkIf cfg.enable {
- # This is enough to make a symlink because the xserver
- # module already links all /share/X11 paths.
environment.systemPackages = [ x11Fonts ];
+ environment.pathsToLink = [ "/share/X11/fonts" ];
services.xserver.filesSection = ''
FontPath "${x11Fonts}/share/X11/fonts"