Unverified Commit ef103a6e authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

python312Packages.pyside2: use python.pkgs.distutils (#342948)

parents 9b5adc38 abd8708c

pkgs/development/python-modules/pyside2/default.nix

+9 −25
Original line number Diff line number Diff line 
{

  python,

  pythonAtLeast,

  fetchurl,

  lib,

  stdenv,
@@ -35,26 +34,7 @@ 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"

    '')

    + ''

  postPatch = ''

    cd sources/pyside2

  '';
@@ -69,8 +49,12 @@ stdenv.mkDerivation rec { 
    cmake

    ninja

    qt5.qmake

    python

    python.pkgs.setuptools

    (python.withPackages (

      ps: with ps; [

        distutils

        setuptools

      ]

    ))

  ];



  buildInputs =

pkgs/development/python-modules/shiboken2/default.nix

+9 −25
Original line number Diff line number Diff line 
{

  python,

  pythonAtLeast,

  lib,

  stdenv,

  pyside2,
@@ -15,27 +14,7 @@ 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"

    '')

    + ''

  postPatch = ''

    cd sources/shiboken2

  '';
@@ -43,7 +22,12 @@ stdenv.mkDerivation { 


  nativeBuildInputs = [

    cmake

    (python.withPackages (ps: with ps; [ setuptools ]))

    (python.withPackages (

      ps: with ps; [

        distutils

        setuptools

      ]

    ))

  ];



  buildInputs =