Skip to content

Commit

Permalink
Revert "nixos/fontconfig: fix 50-user.conf handling"
Browse files Browse the repository at this point in the history
This reverts commit 8425726.

This should have been reverted in #95358
but I forgot about it.
  • Loading branch information
jtojnar committed Sep 6, 2020
1 parent 6eea644 commit f0cb5c6
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions nixos/modules/config/fonts/fontconfig.nix
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,8 @@ let
ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 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
${optionalString (!cfg.includeUserConf) ''
rm $dst/50-user.conf
''}
# local.conf (indirect priority 51)
Expand Down

0 comments on commit f0cb5c6

Please sign in to comment.