From f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Sep 2020 02:56:31 +0200 Subject: [PATCH] Revert "nixos/fontconfig: fix 50-user.conf handling" This reverts commit 8425726f86a2f4a38d0022f3d5cb1d2001da6999. This should have been reverted in https://github.com/NixOS/nixpkgs/pull/95358 but I forgot about it. --- nixos/modules/config/fonts/fontconfig.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1de1916a07d6..5b681ca59464 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -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)