From 6bbf6293ea1687096e9e0d43fae64826e16c99c4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 02:58:17 +0200 Subject: [PATCH 1/2] installFonts: install pcf.gz --- pkgs/build-support/setup-hooks/install-fonts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/setup-hooks/install-fonts.sh b/pkgs/build-support/setup-hooks/install-fonts.sh index 2e63cd75f0a5..46909fe83c03 100644 --- a/pkgs/build-support/setup-hooks/install-fonts.sh +++ b/pkgs/build-support/setup-hooks/install-fonts.sh @@ -46,6 +46,7 @@ installFonts() { installFont 'bdf' "$out/share/fonts/misc" installFont 'pcf' "$out/share/fonts/misc" installFont 'otb' "$out/share/fonts/misc" + installFont 'pcf.gz' "$out/share/fonts/misc" installFont 'psf' "$out/share/consolefonts" installFont 'psfu' "$out/share/consolefonts" From dd7a495f239435d60c05a911e243dbc9260a505e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 02:58:25 +0200 Subject: [PATCH 2/2] envypn-font: use installFonts --- pkgs/by-name/en/envypn-font/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/en/envypn-font/package.nix b/pkgs/by-name/en/envypn-font/package.nix index 2535b2db9a22..5ea85b53d92f 100644 --- a/pkgs/by-name/en/envypn-font/package.nix +++ b/pkgs/by-name/en/envypn-font/package.nix @@ -5,6 +5,7 @@ libfaketime, mkfontscale, fonttosfnt, + installFonts, }: stdenv.mkDerivation (finalAttrs: { @@ -17,6 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + installFonts libfaketime fonttosfnt mkfontscale @@ -38,13 +40,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; - installPhase = '' - runHook preInstall - - install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz + postInstall = '' mkfontdir "$out/share/fonts/misc" - - runHook postInstall ''; meta = {