Merge pull request #141277 from NixOS/backport-140723-to-release-21.05

[Backport release-21.05] nixos/fontdir: always link the font directory
2021-10-11 20:28:20 +02:00
parent b31ab18db6 36d4e53859
commit 79c970a7bb
1 changed files with 1 additions and 2 deletions
--- 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"