[staging-next] {jetbrains-mono, python313Packages.gftools,python313Packages.ttfautohint-py}: fix build (#538318)

2026-07-19 15:11:30 +00:00 · 2026-07-05 06:51:50 +00:00
parent 1b4836a2ba 2278d8e20e
commit a3b412e668
3 changed files with 3 additions and 7 deletions
--- a/pkgs/by-name/je/jetbrains-mono/package.nix
+++ b/pkgs/by-name/je/jetbrains-mono/package.nix
@@ -2,7 +2,7 @@
  lib,
  stdenvNoCC,
  fetchFromGitHub,
-  python3Packages,
+  python313Packages,
 }:

 stdenvNoCC.mkDerivation rec {
@@ -19,7 +19,8 @@ stdenvNoCC.mkDerivation rec {
  env."PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION" = "python";

  nativeBuildInputs = [
-    python3Packages.gftools
+    # Currently broken on 3.14
+    python313Packages.gftools
  ];

  buildPhase = ''
--- a/pkgs/development/python-modules/gftools/default.nix
+++ b/pkgs/development/python-modules/gftools/default.nix
@@ -158,7 +158,6 @@ buildPythonPackage rec {
    requests
    rich
    ruamel-yaml
-    setuptools
    skia-pathops
    statmake
    strictyaml
--- a/pkgs/development/python-modules/ttfautohint-py/default.nix
+++ b/pkgs/development/python-modules/ttfautohint-py/default.nix
@@ -36,10 +36,6 @@ buildPythonPackage rec {
    distutils
  ];

-  dependencies = [
-    setuptools # for pkg_resources
-  ];
-
  buildInputs = [ ttfautohint ];

  nativeCheckInputs = [