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

nixos/fontconfig: fix 50-user.conf handling

Browse Source 
Apparently, edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while
rebasing https://github.com/NixOS/nixpkgs/pull/93562.

Provide 50-user.conf in fontconfig if includeUserConf is true (the
default), and don't try removing the non-existent one if it's disabled

Fixes https://github.com/NixOS/nixpkgs/issues/95685
Fixes https://github.com/NixOS/nixpkgs/issues/95712
This commit is contained in:
Florian Klink 2020-08-17 23:12:57 +02:00
parent fd2c6cd7ea
commit 8425726f86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/config/fonts/fontconfig.nix
View File

@ -204,8 +204,10 @@ let
ln -s ${renderConf} $dst/10-nixos-rendering.conf ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 50-user.conf # 50-user.conf
${optionalString (!cfg.includeUserConf) '' # Since latest fontconfig looks for default files inside the package,
rm $dst/50-user.conf # we had to move this one elsewhere to be able to exclude it here.
${optionalString cfg.includeUserConf ''
ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf
''} ''}
# local.conf (indirect priority 51) # local.conf (indirect priority 51)