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 1/3] 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 = [ ];
   };
-}
+})

From 75e66b552cccbb19995d718a20d8d50e44b40716 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 8 Jul 2026 14:20:36 -0700
Subject: [PATCH 2/3] ttf-envy-code-r: add pancaek to maintainers

---
 pkgs/by-name/tt/ttf-envy-code-r/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 51b9559c1505..1088beb08f08 100644
--- a/pkgs/by-name/tt/ttf-envy-code-r/package.nix
+++ b/pkgs/by-name/tt/ttf-envy-code-r/package.nix
@@ -29,6 +29,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://damieng.com/blog/tag/envy-code-r";
     description = "Free scalable coding font by DamienG";
     license = lib.licenses.unfree;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
   };
 })

From e058e6fc62f17cf671da60d33697cd3d50bcfeac Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 8 Jul 2026 14:23:36 -0700
Subject: [PATCH 3/3] ttf-envy-code-r: update homepage

---
 pkgs/by-name/tt/ttf-envy-code-r/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1088beb08f08..8ee93f27a3a0 100644
--- a/pkgs/by-name/tt/ttf-envy-code-r/package.nix
+++ b/pkgs/by-name/tt/ttf-envy-code-r/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://damieng.com/blog/tag/envy-code-r";
+    homepage = "https://damieng.com/typography/";
     description = "Free scalable coding font by DamienG";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ pancaek ];