From d04a605371ca4c0da38a5c38f517f58724bcce04 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 9 Sep 2026 11:44:13 +0200
Subject: [PATCH 1/3] python3Packages.fontmake: use finalAttrs

---
 pkgs/development/python-modules/fontmake/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index ad3cda6872a9..935ce1a31aa4 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -15,7 +15,7 @@
   ufolib2,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "fontmake";
   version = "3.12.1";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "fontmake";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dgforezrilmD2d6MFY3Z5X/82yPRfSW/I/OxXcZ+xJw=";
   };
 
@@ -51,15 +51,15 @@ buildPythonPackage rec {
     repacker = fonttools.optional-dependencies.repacker;
   };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.autohint;
+  nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.autohint;
 
   pythonImportsCheck = [ "fontmake" ];
 
   meta = {
     description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)";
     homepage = "https://github.com/googlefonts/fontmake";
-    changelog = "https://github.com/googlefonts/fontmake/releases/tag/${src.tag}";
+    changelog = "https://github.com/googlefonts/fontmake/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

From 8859f5089e69c6857d3e169a667ce6ac81b53fa4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 9 Sep 2026 11:44:13 +0200
Subject: [PATCH 2/3] python3Packages.fontmake: clean up depencies

---
 pkgs/development/python-modules/fontmake/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 935ce1a31aa4..d65e80afab85 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -2,8 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   pytestCheckHook,
+  cattrs,
   fontmath,
   fonttools,
   glyphslib,
@@ -46,12 +46,18 @@ buildPythonPackage (finalAttrs: {
 
   optional-dependencies = {
     pathops = [ skia-pathops ];
+    lxml = [ ];
+    mutatormath = [ ];
     autohint = [ ttfautohint-py ];
     json = ufolib2.optional-dependencies.json;
     repacker = fonttools.optional-dependencies.repacker;
   };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.autohint;
+  nativeCheckInputs = [
+    pytestCheckHook
+    cattrs
+  ]
+  ++ finalAttrs.passthru.optional-dependencies.autohint;
 
   pythonImportsCheck = [ "fontmake" ];
 

From 5521645b2c111385e3b6e15263adcc4256b87fa3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 9 Sep 2026 11:44:13 +0200
Subject: [PATCH 3/3] python3Packahes.fontmake: adopt

---
 pkgs/development/python-modules/fontmake/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index d65e80afab85..eb8d3978bc9c 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/googlefonts/fontmake";
     changelog = "https://github.com/googlefonts/fontmake/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 })