diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-08-20 23:43:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 23:43:47 +0200 |
| commit | 2adf17f8c27386dbfa0e761a90d27f1e1378b472 (patch) | |
| tree | bbf2ca138255f3410b6fd586c5f78de64227d6f9 /nixos | |
| parent | 16f18c37ed15df7414018f23fa48d398767aef74 (diff) | |
| parent | fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab (diff) | |
| download | nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar.gz nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar.bz2 nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar.lz nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar.xz nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.tar.zst nixpkgs-2adf17f8c27386dbfa0e761a90d27f1e1378b472.zip | |
Merge pull request #95869 from jtojnar/fc-local-regression
nixos/fontconfig: fix local.conf regression
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1b6848c652e..1f1044bc5af 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -190,13 +190,6 @@ let ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ $dst/ - # update 51-local.conf path to look at local.conf - rm $dst/51-local.conf - - substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \ - $dst/51-local.conf \ - --replace local.conf /etc/fonts/${pkg.configVersion}/local.conf - # 00-nixos-cache.conf ln -s ${cacheConf} $dst/00-nixos-cache.conf |