From de59208b3bf57015166f716023493b5d546955ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 18 Sep 2024 20:29:29 -0700
Subject: [PATCH 1/2] python312Packages.shiboken2: use python.pkgs.distutils

---
 .../python-modules/shiboken2/default.nix      | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index e35ca8ff6f02..88f59fc86ebb 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,6 +1,5 @@
 {
   python,
-  pythonAtLeast,
   lib,
   stdenv,
   pyside2,
@@ -15,35 +14,20 @@ stdenv.mkDerivation {
 
   inherit (pyside2) version src patches;
 
-  postPatch =
-    (lib.optionalString (pythonAtLeast "3.12") ''
-      substituteInPlace \
-        ez_setup.py \
-        build_scripts/main.py \
-        build_scripts/options.py \
-        build_scripts/utils.py \
-        build_scripts/wheel_override.py \
-        build_scripts/wheel_utils.py \
-        sources/shiboken2/CMakeLists.txt \
-        sources/shiboken2/data/shiboken_helpers.cmake \
-        --replace-fail "from distutils" "import setuptools; from distutils"
-      substituteInPlace \
-        build_scripts/config.py \
-        build_scripts/main.py \
-        build_scripts/options.py \
-        build_scripts/setup_runner.py \
-        build_scripts/utils.py \
-        --replace-fail "import distutils" "import setuptools; import distutils"
-    '')
-    + ''
-      cd sources/shiboken2
-    '';
+  postPatch = ''
+    cd sources/shiboken2
+  '';
 
   CLANG_INSTALL_DIR = llvmPackages_15.libclang.out;
 
   nativeBuildInputs = [
     cmake
-    (python.withPackages (ps: with ps; [ setuptools ]))
+    (python.withPackages (
+      ps: with ps; [
+        distutils
+        setuptools
+      ]
+    ))
   ];
 
   buildInputs =

From abd8708ccc945c1c6c2d6fbd20f4cb07f8124097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 18 Sep 2024 20:30:13 -0700
Subject: [PATCH 2/2] python312Packages.pyside2: use python.pkgs.distutils

---
 .../python-modules/pyside2/default.nix        | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index d66ef9a52257..d228e3fde29f 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -1,6 +1,5 @@
 {
   python,
-  pythonAtLeast,
   fetchurl,
   lib,
   stdenv,
@@ -35,28 +34,9 @@ stdenv.mkDerivation rec {
     ./Modify-sendCommand-signatures.patch
   ];
 
-  postPatch =
-    (lib.optionalString (pythonAtLeast "3.12") ''
-      substituteInPlace \
-        ez_setup.py \
-        build_scripts/main.py \
-        build_scripts/options.py \
-        build_scripts/utils.py \
-        build_scripts/wheel_override.py \
-        build_scripts/wheel_utils.py \
-        sources/pyside2/CMakeLists.txt \
-        --replace-fail "from distutils" "import setuptools; from distutils"
-      substituteInPlace \
-        build_scripts/config.py \
-        build_scripts/main.py \
-        build_scripts/options.py \
-        build_scripts/setup_runner.py \
-        build_scripts/utils.py \
-        --replace-fail "import distutils" "import setuptools; import distutils"
-    '')
-    + ''
-      cd sources/pyside2
-    '';
+  postPatch = ''
+    cd sources/pyside2
+  '';
 
   cmakeFlags = [
     "-DBUILD_TESTS=OFF"
@@ -69,8 +49,12 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     qt5.qmake
-    python
-    python.pkgs.setuptools
+    (python.withPackages (
+      ps: with ps; [
+        distutils
+        setuptools
+      ]
+    ))
   ];
 
   buildInputs =