diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-06 02:56:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-06 02:56:31 +0200 |
| commit | f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54 (patch) | |
| tree | f27c370eef1bdb9eca79726684652559480d7357 /nixos | |
| parent | 6eea644749f8899a5760c6c0a59fac9ea6f4c06f (diff) | |
| download | nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar.gz nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar.bz2 nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar.lz nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar.xz nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.tar.zst nixpkgs-f0cb5c6a150bea1b8b7fc9dc3b0cdecceb0bdc54.zip | |
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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1de1916a07d..5b681ca5946 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) |