From b99f745b0ebb738ca8b51aae5a375adcbd90629b Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 17 Jun 2026 20:10:09 -0700 Subject: [PATCH] vollkorn: use installFonts --- pkgs/by-name/vo/vollkorn/package.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/vo/vollkorn/package.nix b/pkgs/by-name/vo/vollkorn/package.nix index ca464aa40d00..736c8b65c135 100644 --- a/pkgs/by-name/vo/vollkorn/package.nix +++ b/pkgs/by-name/vo/vollkorn/package.nix @@ -2,31 +2,31 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "vollkorn"; version = "4.105"; + outputs = [ + "out" + "webfont" + "doc" + ]; + src = fetchzip { url = "http://vollkorn-typeface.com/download/vollkorn-${ - builtins.replaceStrings [ "." ] [ "-" ] version + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version }.zip"; stripRoot = false; hash = "sha256-oG79GgCwCavbMFAPakza08IPmt13Gwujrkc/NKTai7g="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} - cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ - cp -v PS-OTF/*.otf $out/share/fonts/opentype - cp -v TTF/*.ttf $out/share/fonts/truetype - cp -v WOFF/*.woff $out/share/fonts/WOFF - cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 - - runHook postInstall + postInstall = '' + install -Dm444 {Fontlog,OFL-FAQ,OFL}.txt -t $doc/share/doc/${finalAttrs.pname}-${finalAttrs.version}/ ''; meta = { @@ -36,4 +36,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.schmittlauch ]; }; -} +})