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 = 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 =