From 4fc3fc23e58463b76bf354118fa21314c7e541a7 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Aug 2023 20:18:50 +0300 Subject: [PATCH] overrides/pyqt5: be explicit about dependencies Explicitly list the modules we depend on instead of relying on qt5.full. Also removes deprecated and unmaintained qt5.qtwebkit dependency. --- overrides/default.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/overrides/default.nix b/overrides/default.nix index e9a853e..e1e5906 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -93,6 +93,25 @@ lib.composeManyExtensions [ in pkgs."qt${selector}" or pkgs.qt5; + pyQt5Modules = qt5: with qt5; [ + qt3d + qtbase + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qtgamepad + qtlocation + qtmultimedia + qtsensors + qtserialport + qtsvg + qtwebchannel + qtwebengine + qtwebsockets + qtx11extras + qtxmlpatterns + ]; in { @@ -2154,10 +2173,9 @@ lib.composeManyExtensions [ dontConfigure = true; dontWrapQtApps = true; - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ pyQt5Modules qt5 ++ [ self.pyqt-builder self.sip - qt5.full ]; } ); @@ -2169,9 +2187,7 @@ lib.composeManyExtensions [ super.pyqt5-qt5.overridePythonAttrs ( old: { dontWrapQtApps = true; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ - qt5.full - qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ pyQt5Modules qt5 ++ [ pkgs.gtk3 pkgs.speechd pkgs.postgresql