From facefec1399fc718a0ad59fd1511e3b4c406af67 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Dec 2018 16:18:38 -0500 Subject: [PATCH] pyqt5: make qtwebkit optional, disable by default qtwebkit appears to be unsupported in Qt 5.11. We are using some old port https://github.com/NixOS/nixpkgs/blob/475d653afdbd8fe3e00ccfd22a30014b0df7aeaa/pkgs/development/libraries/qt-5/5.11/default.nix#L39-L48 and it is broken on darwin. --- 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 17b4ecb75d96..50dbe51e7684 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,7 +1,8 @@ { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig -, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus -, withWebSockets ? false, qtwebsockets +, qmake, lndir, qtbase, qtsvg, qtwebengine, dbus , withConnectivity ? false, qtconnectivity +, withWebKit ? false, qtwebkit +, withWebSockets ? false, qtwebsockets }: let @@ -36,9 +37,11 @@ in buildPythonPackage { buildInputs = [ dbus sip ]; - propagatedBuildInputs = [ - qtbase qtsvg qtwebkit qtwebengine - ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; + propagatedBuildInputs = [ qtbase qtsvg qtwebengine ] + ++ lib.optional (!isPy3k) enum34 + ++ lib.optional withConnectivity qtconnectivity + ++ lib.optional withWebKit qtwebkit + ++ lib.optional withWebSockets qtwebsockets; configurePhase = '' runHook preConfigure