From b062bc95b75eb158452d7590563304598b65a991 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 3 Mar 2026 11:26:31 +0100 Subject: [PATCH] eb-garamond: switch to installFonts --- pkgs/by-name/eb/eb-garamond/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix index c4e589d66aca..9bd15582bb78 100644 --- a/pkgs/by-name/eb/eb-garamond/package.nix +++ b/pkgs/by-name/eb/eb-garamond/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, python3, ttfautohint-nox, }: @@ -16,7 +17,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ="; }; + outputs = [ + "out" + "webfont" + ]; + nativeBuildInputs = [ + installFonts (python3.withPackages (p: [ p.fontforge ])) ttfautohint-nox ]; @@ -32,13 +39,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postBuild ''; + # installFonts adds a hook to `postInstall` that installs fonts + # into the correct directories installPhase = '' runHook preInstall - - install -Dm644 build/*.ttf -t $out/share/fonts/truetype - install -Dm644 build/*.otf -t $out/share/fonts/opentype - install -Dm644 build/*.woff -t $out/share/fonts/woff - runHook postInstall '';