1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00

fontconfig: fix cache existence tests

This commit is contained in:
Benedikt Rips 2025-10-26 19:12:16 +01:00 committed by Austin Horstman
parent b53026f683
commit 05c7c900f1
3 changed files with 20 additions and 40 deletions

View file

@ -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;

View file

@ -1,15 +1,17 @@
{ pkgs, ... }:
{
config = {
home.packages = [
pkgs.comic-relief
pkgs.unifont
];
{ realPkgs, ... }:
{
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
'';
};
}

View file

@ -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