pythonPackages: add qt6 override
A few qt6 modules require python. We need to override with the appropriate python version in order to use qt6 with non-default python packages (like python311).
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
, libglvnd
|
||||
, darwin
|
||||
, buildPackages
|
||||
, python3
|
||||
|
||||
# options
|
||||
, developerBuild ? false
|
||||
@@ -24,7 +25,7 @@ let
|
||||
addPackages = self: with self;
|
||||
let
|
||||
callPackage = self.newScope ({
|
||||
inherit qtModule srcs;
|
||||
inherit qtModule srcs python3;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
});
|
||||
in
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, cmake
|
||||
, ninja
|
||||
, qt6
|
||||
, python
|
||||
, moveBuildTree
|
||||
, shiboken6
|
||||
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
moveBuildTree
|
||||
];
|
||||
|
||||
buildInputs = with qt6; [
|
||||
buildInputs = with python.pkgs.qt6; [
|
||||
# required
|
||||
qtbase
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, fetchurl
|
||||
, llvmPackages
|
||||
, python
|
||||
, qt6
|
||||
, cmake
|
||||
, autoPatchelfHook
|
||||
, stdenv
|
||||
@@ -35,7 +34,7 @@ llvmPackages.stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
llvmPackages.llvm
|
||||
llvmPackages.libclang
|
||||
qt6.qtbase
|
||||
python.pkgs.qt6.qtbase
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -9894,7 +9894,7 @@ self: super: with self; {
|
||||
});
|
||||
|
||||
pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 {
|
||||
inherit (pkgs) cmake ninja qt6;
|
||||
inherit (pkgs) cmake ninja;
|
||||
});
|
||||
|
||||
pyside = callPackage ../development/python-modules/pyside {
|
||||
@@ -10912,6 +10912,10 @@ self: super: with self; {
|
||||
|
||||
qt5reactor = callPackage ../development/python-modules/qt5reactor { };
|
||||
|
||||
qt6 = pkgs.qt6.override {
|
||||
python3 = self.python;
|
||||
};
|
||||
|
||||
qtawesome = callPackage ../development/python-modules/qtawesome { };
|
||||
|
||||
qtconsole = callPackage ../development/python-modules/qtconsole { };
|
||||
@@ -11735,7 +11739,7 @@ self: super: with self; {
|
||||
});
|
||||
|
||||
shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 {
|
||||
inherit (pkgs) cmake llvmPackages qt6;
|
||||
inherit (pkgs) cmake llvmPackages;
|
||||
});
|
||||
|
||||
shippai = callPackage ../development/python-modules/shippai { };
|
||||
|
||||
Reference in New Issue
Block a user