From fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 20 Aug 2020 20:09:28 +0200 Subject: [PATCH] nixos/fontconfig: fix local.conf regression Another part of edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while rebasing https://github.com/NixOS/nixpkgs/pull/93562, resulting in incorrect path as described by https://github.com/NixOS/nixpkgs/issues/86601#issuecomment-675462227 --- nixos/modules/config/fonts/fontconfig.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1b6848c652e0..1f1044bc5af8 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