From 05c7c900f1530989ab4c50592e666550ee0eda42 Mon Sep 17 00:00:00 2001
From: Benedikt Rips <benedikt.rips@gmail.com>
Date: Sun, 26 Oct 2025 19:12:16 +0100
Subject: [PATCH] fontconfig: fix cache existence tests

---
 tests/modules/misc/fontconfig/default.nix     | 19 +--------------
 .../fontconfig/multiple-font-packages.nix     | 24 ++++++++++---------
 .../misc/fontconfig/single-font-package.nix   | 17 +++++--------
 3 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/tests/modules/misc/fontconfig/default.nix b/tests/modules/misc/fontconfig/default.nix
index 50ab6acba..c28bbe359 100644
--- a/tests/modules/misc/fontconfig/default.nix
+++ b/tests/modules/misc/fontconfig/default.nix
@@ -1,24 +1,7 @@
 {
   fontconfig-no-font-package = ./no-font-package.nix;
   fontconfig-single-font-package = ./single-font-package.nix;
-  # Disabled due to test failing with message
-  #
-  #  Expected directory home-path/lib/fontconfig/cache to exist but it was not found.
-  #
-  # Verbose output from fc-cache:
-  #
-  #  Font directories:
-  #          /nix/store/da…g5-home-manager-path/lib/X11/fonts
-  #          /nix/store/da…g5-home-manager-path/share/fonts
-  #          /nix/store/da…g5-home-manager-path/share/fonts/truetype
-  #  /nix/store/da…g5-home-manager-path/lib/X11/fonts: skipping, no such directory
-  #  /nix/store/da…g5-home-manager-path/share/fonts: caching, new cache contents: 1 fonts, 1 dirs
-  #  /nix/store/da…g5-home-manager-path/share/fonts/truetype: caching, new cache contents: 3 fonts, 0 dirs
-  #  /nix/store/da…g5-home-manager-path/share/fonts/truetype: skipping, looped directory detected
-  #  /nix/store/da…g5-home-manager-path/lib/fontconfig/cache: cleaning cache directory
-  #  /nix/store/da…g5-home-manager-path/lib/fontconfig/cache: invalid cache file: 786068e7df13f7c2105017ef3d78e351-x86_64.cache-7
-  #  /nix/store/da…g5-home-manager-path/lib/fontconfig/cache: invalid cache file: 4766193978ddda4bd196f2b98c00fb00-x86_64.cache-7
-  #fontconfig-multiple-font-packages = ./multiple-font-packages.nix;
+  fontconfig-multiple-font-packages = ./multiple-font-packages.nix;
 
   fontconfig-default-rendering = ./default-rendering.nix;
   fontconfig-custom-rendering = ./custom-rendering.nix;
diff --git a/tests/modules/misc/fontconfig/multiple-font-packages.nix b/tests/modules/misc/fontconfig/multiple-font-packages.nix
index 9c47e5683..e88812d56 100644
--- a/tests/modules/misc/fontconfig/multiple-font-packages.nix
+++ b/tests/modules/misc/fontconfig/multiple-font-packages.nix
@@ -1,15 +1,17 @@
-{ pkgs, ... }:
+{ realPkgs, ... }:
+
 {
-  config = {
-    home.packages = [
-      pkgs.comic-relief
-      pkgs.unifont
-    ];
+  fonts.fontconfig.enable = true;
 
-    fonts.fontconfig.enable = true;
+  # Use `realPkgs` here since the creation of the fontconfig cache relies on the
+  # `fc-cache` binary and actual (non-stubbed) fonts.
+  test.unstubs = [ (self: super: { inherit (realPkgs) fontconfig; }) ];
+  home.packages = [
+    realPkgs.comic-relief
+    realPkgs.unifont
+  ];
 
-    nmt.script = ''
-      assertDirectoryNotEmpty home-path/lib/fontconfig/cache
-    '';
-  };
+  nmt.script = ''
+    assertDirectoryNotEmpty home-path/lib/fontconfig/cache
+  '';
 }
diff --git a/tests/modules/misc/fontconfig/single-font-package.nix b/tests/modules/misc/fontconfig/single-font-package.nix
index 86c3f0e4f..39f4fe08b 100644
--- a/tests/modules/misc/fontconfig/single-font-package.nix
+++ b/tests/modules/misc/fontconfig/single-font-package.nix
@@ -1,17 +1,12 @@
+{ realPkgs, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  realPkgs,
-  ...
-}:
-
-lib.mkIf config.test.enableBig {
-  home.packages = [ pkgs.comic-relief ];
-
   fonts.fontconfig.enable = true;
 
-  _module.args.pkgs = lib.mkForce realPkgs;
+  # Use `realPkgs` here since the creation of the fontconfig cache relies on the
+  # `fc-cache` binary and actual (non-stubbed) fonts.
+  test.unstubs = [ (self: super: { inherit (realPkgs) fontconfig; }) ];
+  home.packages = [ realPkgs.comic-relief ];
 
   nmt.script = ''
     assertDirectoryNotEmpty home-path/lib/fontconfig/cache