From 99a697368892e5e48a39c2e0a1e2b9c7ac7a411c Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 18 Nov 2025 23:16:30 +0100
Subject: [PATCH 1/2] eb-garamond: disable ttfautohint's GUI

(cherry picked from commit 68b124821aa9272e7c4f28f8909b26710eae593d)
---
 pkgs/by-name/eb/eb-garamond/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index e2417fd380b79..e839dbea17c57 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   python3,
-  ttfautohint,
+  ttfautohint-nox,
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "eb-garamond";
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
 
   nativeBuildInputs = [
     (python3.withPackages (p: [ p.fontforge ]))
-    ttfautohint
+    ttfautohint-nox
   ];
 
   postPatch = ''

From a0b56d1c084d9c8b8470140de9d19f0a9fc1ed46 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 18 Nov 2025 22:45:49 +0100
Subject: [PATCH 2/2] eb-garamond: modernise

`rec` -> `finalAttrs`, inlining `with lib`

(cherry picked from commit 8151f333a612bf530849a42a2997893790657ed3)
---
 pkgs/by-name/eb/eb-garamond/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index e839dbea17c57..c4e589d66acad 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -5,14 +5,14 @@
   python3,
   ttfautohint-nox,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eb-garamond";
   version = "0.016";
 
   src = fetchFromGitHub {
     owner = "georgd";
     repo = "EB-Garamond";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ=";
   };
 
@@ -42,15 +42,15 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.georgduffner.at/ebgaramond/";
     description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bengsparks
       relrod
       rycee
     ];
-    license = licenses.ofl;
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
   };
-}
+})