Skip to content

Commit

Permalink
nixos/fontconfig: fix 50-user.conf handling
Browse files Browse the repository at this point in the history
Apparently, edf2541 was missed while
rebasing #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 #95685
Fixes #95712
  • Loading branch information
flokli committed Aug 17, 2020
1 parent fd2c6cd commit 8425726
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions nixos/modules/config/fonts/fontconfig.nix
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,10 @@ let
ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 50-user.conf
${optionalString (!cfg.includeUserConf) ''
rm $dst/50-user.conf
# Since latest fontconfig looks for default files inside the package,
# 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)
Expand Down

0 comments on commit 8425726

Please sign in to comment.