From b1b4c6c4eb92e59dcd664645f74b1c57b08204d0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 21 Mar 2018 23:07:05 +0300 Subject: [PATCH] pyqt5: propagate Qt dependencies This is so that Qt user environment packages are also propagated. Fixes Electrum environment installations when no other Qt applications are installed. Added `dev` output so that closure size won't explode. --- pkgs/development/python-modules/pyqt/5.x.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 225da204e21a..50cb8ceba913 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -9,6 +9,7 @@ let version = "5.10"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; + in buildPythonPackage { pname = pname; version = version; @@ -27,14 +28,16 @@ in buildPythonPackage { sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + outputs = [ "out" "dev" ]; - buildInputs = [ - lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs + nativeBuildInputs = [ pkgconfig qmake lndir ]; + + buildInputs = [ dbus_libs ]; + + propagatedBuildInputs = [ + sip qtbase qtsvg qtwebkit qtwebengine ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; - propagatedBuildInputs = [ sip ]; - configurePhase = '' runHook preConfigure