From f9186c64fcc6ee5f0114547acf9e814c806a640b Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Wed, 21 May 2025 21:04:44 -0400 Subject: [PATCH] Revert "fontconfig: Fix missing default fontconfig files (#7045)" (#7103) This reverts commit 65d2282ff6cf560f54997013bd1e575fbd0a7ebf. --- modules/misc/fontconfig.nix | 13 ------------- tests/modules/misc/fontconfig/no-font-package.nix | 2 -- 2 files changed, 15 deletions(-) diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix index 981383d3..2b01046e 100644 --- a/modules/misc/fontconfig.nix +++ b/modules/misc/fontconfig.nix @@ -96,19 +96,6 @@ in # trying to write to a read-only location. (pkgs.runCommandLocal "dummy-fc-dir1" { } "mkdir -p $out/lib/fontconfig") (pkgs.runCommandLocal "dummy-fc-dir2" { } "mkdir -p $out/lib/fontconfig") - # Provide fontconfig default files from /etc/fonts/ - (pkgs.runCommand "fontconfig-conf" { } '' - dst=$out/etc/fonts/conf.d - mkdir -p $dst - - # fonts.conf - ln -s ${pkgs.fontconfig.out}/etc/fonts/fonts.conf \ - $dst/../fonts.conf - - # fontconfig default config files - ln -s ${pkgs.fontconfig.out}/etc/fonts/conf.d/*.conf \ - $dst/ - '') ]; home.extraProfileCommands = '' diff --git a/tests/modules/misc/fontconfig/no-font-package.nix b/tests/modules/misc/fontconfig/no-font-package.nix index ce5ddd3a..52b2a74d 100644 --- a/tests/modules/misc/fontconfig/no-font-package.nix +++ b/tests/modules/misc/fontconfig/no-font-package.nix @@ -7,7 +7,5 @@ nmt.script = '' assertPathNotExists home-path/lib/fontconfig/cache - assertLinkExists home-path/etc/fonts/fonts.conf - assertDirectoryExists home-path/etc/fonts/conf.d ''; }