summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-08-20 20:09:28 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-08-20 20:09:28 +0200
commitfe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab (patch)
treea2eb52a68097a26f58135b426deb2f06aa63bf52 /nixos/modules
parent4dd782f5ddc03253713875944fe1f4be6a3329be (diff)
downloadnixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar.gz
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar.bz2
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar.lz
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar.xz
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.tar.zst
nixpkgs-fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab.zip
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
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix7
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