public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

[Backport release-21.05] nixos/fontdir: always link the font directory
This commit is contained in:
Michele Guerini Rocco 2021-10-11 20:28:20 +02:00 committed by GitHub
parent b31ab18db6 36d4e53859
commit 79c970a7bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/config/fonts/fontdir.nix
View File

@ -50,9 +50,8 @@ in
config = mkIf cfg.enable { 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.systemPackages = [ x11Fonts ];
environment.pathsToLink = [ "/share/X11/fonts" ];
services.xserver.filesSection = '' services.xserver.filesSection = ''
FontPath "${x11Fonts}/share/X11/fonts" FontPath "${x11Fonts}/share/X11/fonts"