diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 9e9e61ca60d3..62d0935c8336 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -4,6 +4,7 @@
   lib,
   bats,
   fetchFromGitHub,
+  fetchpatch,
   python,
   buildPythonApplication,
   callPackage,
@@ -47,6 +48,14 @@ buildPythonApplication (finalAttrs: {
     '';
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-stencil-arc-numpy2.patch";
+      url = "https://github.com/yaqwsx/KiKit/commit/036ca08fc380dd2c5b8b3ba2adc4215f4114e975.patch?full_index=1";
+      hash = "sha256-AmvH822nAubqVhl1PEKvE0Ij/K0NrBsSvnMUJXgxmfI=";
+    })
+  ];
+
   build-system = [
     setuptools
   ];
diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix
index 7003d6a590ce..7f02e5c00228 100644
--- a/pkgs/by-name/ki/kikit/solidpython/default.nix
+++ b/pkgs/by-name/ki/kikit/solidpython/default.nix
@@ -7,7 +7,7 @@
   poetry-core,
   prettytable,
   ply,
-  setuptools,
+  setuptools_80,
   euclid3,
 }:
 buildPythonPackage (finalAttrs: {
@@ -28,7 +28,8 @@ buildPythonPackage (finalAttrs: {
 
   propagatedBuildInputs = [
     ply
-    setuptools
+    # Pinned to v80 due to pkg_resources removal, see https://github.com/SolidCode/SolidPython/issues/216
+    setuptools_80
     euclid3
 
     prettytable