From bc88417ed5fdf1ffbf5c9fab3bd25e274f875614 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 25 Dec 2025 17:41:00 +0100 Subject: [PATCH] fontconfig: fix make-fonts-cache for structuredAttrs --- .../libraries/fontconfig/make-fonts-cache.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 9054cf6756ba..9351a5179226 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,5 +1,6 @@ { buildPackages, + writeText, fontconfig, lib, runCommand, @@ -13,15 +14,16 @@ in fontDirectories, }: +let + fontDirsPath = writeText "font-dirs" '' + + ${lib.concatStringsSep "\n" (map (font: "${font}") fontDirectories)} + ''; +in runCommand "fc-cache" { preferLocalBuild = true; allowSubstitutes = false; - passAsFile = [ "fontDirs" ]; - fontDirs = '' - - ${lib.concatStringsSep "\n" (map (font: "${font}") fontDirectories)} - ''; } '' export FONTCONFIG_FILE=$(pwd)/fonts.conf @@ -33,7 +35,7 @@ runCommand "fc-cache" ${fontconfig.out}/etc/fonts/fonts.conf $out EOF - cat "$fontDirsPath" >> fonts.conf + cat "${fontDirsPath}" >> fonts.conf echo "" >> fonts.conf # N.B.: fc-cache keys its cache entries by architecture.