From 12aedfe7a8d05c90cc6b3cef7307de60d0c8d556 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 8 Jul 2026 14:18:36 -0700 Subject: [PATCH] ttf-envy-code-r: use installFonts, fix download url --- pkgs/by-name/tt/ttf-envy-code-r/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/tt/ttf-envy-code-r/package.nix b/pkgs/by-name/tt/ttf-envy-code-r/package.nix index db23fa13de74..51b9559c1505 100644 --- a/pkgs/by-name/tt/ttf-envy-code-r/package.nix +++ b/pkgs/by-name/tt/ttf-envy-code-r/package.nix @@ -2,24 +2,27 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ttf-envy-code-r"; version = "PR7"; + outputs = [ + "out" + "doc" + ]; + src = fetchzip { - url = "https://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + url = "https://dl.damieng.com/fonts/original/EnvyCodeR-${finalAttrs.version}.zip"; hash = "sha256-pJqC/sbNjxEwbVf2CVoXMBI5zvT3DqzRlKSqFT8I2sM="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *.txt -t $out/share/doc/${pname} - - runHook postInstall + postInstall = '' + install -Dm644 *.txt -t $doc/share/doc/${finalAttrs.pname}-${finalAttrs.version} ''; meta = { @@ -28,4 +31,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.unfree; maintainers = [ ]; }; -} +})