Merge pull request #266574 from lilyinstarlight/fix/staging-next-pyside2

[staging-next] python311Packages.shiboken2: use llvmPackages_15 since pyside2 only supports libclang<16
This commit is contained in:
Weijia Wang
2023-11-10 22:45:59 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
@@ -5,7 +5,7 @@
, cmake
, qt5
, libxcrypt
, llvmPackages
, llvmPackages_15
}:
stdenv.mkDerivation {
@@ -21,12 +21,12 @@ stdenv.mkDerivation {
cd sources/shiboken2
'';
CLANG_INSTALL_DIR = llvmPackages.libclang.out;
CLANG_INSTALL_DIR = llvmPackages_15.libclang.out;
nativeBuildInputs = [ cmake ];
buildInputs = [
llvmPackages.libclang
llvmPackages_15.libclang
python
python.pkgs.setuptools
qt5.qtbase
+1 -1
View File
@@ -12798,7 +12798,7 @@ self: super: with self; {
shellingham = callPackage ../development/python-modules/shellingham { };
shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 {
inherit (pkgs) cmake llvmPackages qt5;
inherit (pkgs) cmake llvmPackages_15 qt5;
});
shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 {