python311Packages.pyqtwebengine: use regular callPackage

This commit is contained in:
éclairevoyant 2024-07-10 21:58:32 -04:00
parent d43df1f6f4
commit 42918d68f2
No known key found for this signature in database
GPG Key ID: E3813AEAA02DB54B
2 changed files with 25 additions and 34 deletions

View File

@ -1,28 +1,20 @@
{
lib,
setuptools,
stdenv,
pythonPackages,
fetchPypi,
pkg-config,
qmake,
qtbase,
qtsvg,
qtwebengine,
qtwebchannel,
qtdeclarative,
wrapQtAppsHook,
libsForQt5,
darwin,
buildPythonPackage,
python,
isPy27,
pyqt5,
sip,
pyqt-builder,
}:
let
inherit (pythonPackages)
buildPythonPackage
python
isPy27
pyqt5
sip
pyqt-builder
;
inherit (darwin) autoSignDarwinBinariesHook;
in
buildPythonPackage (
@ -52,32 +44,33 @@ buildPythonPackage (
nativeBuildInputs =
[
pkg-config
qmake
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
python.pythonOnBuildForHost.pkgs.sip
]
++ [
qtbase
qtsvg
qtwebengine
libsForQt5.qtbase
libsForQt5.qtsvg
libsForQt5.qtwebengine
pyqt-builder
pythonPackages.setuptools
setuptools
]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ qtdeclarative ]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ]
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ];
buildInputs =
[
sip
qtbase
qtsvg
qtwebengine
libsForQt5.qtbase
libsForQt5.qtsvg
libsForQt5.qtwebengine
]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
qtwebchannel
qtdeclarative
libsForQt5.qtwebchannel
libsForQt5.qtdeclarative
];
propagatedBuildInputs = [ pyqt5 ];
@ -98,21 +91,21 @@ buildPythonPackage (
enableParallelBuilding = true;
passthru = {
inherit wrapQtAppsHook;
inherit (libsForQt5) wrapQtAppsHook;
};
meta = with lib; {
description = "Python bindings for Qt5";
homepage = "http://www.riverbankcomputing.co.uk";
license = licenses.gpl3;
hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms platforms.mesaPlatforms;
};
}
// lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
# TODO: figure out why the env hooks aren't adding these inclusions automatically
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-I${lib.getDev qtbase}/include/QtPrintSupport/"
"-I${lib.getDev qtwebchannel}/include/QtWebChannel/"
"-I${lib.getDev libsForQt5.qtbase}/include/QtPrintSupport/"
"-I${lib.getDev libsForQt5.qtwebchannel}/include/QtWebChannel/"
];
}
)

View File

@ -12013,9 +12013,7 @@ self: super: with self; {
pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine {
pythonPackages = self;
};
pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine { };
pyquery = callPackage ../development/python-modules/pyquery { };