jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyqt5: make qtwebkit optional, disable by default

Browse Source 
qtwebkit appears to be unsupported in Qt 5.11. We are using some old port
475d653afd/pkgs/development/libraries/qt-5/5.11/default.nix (L39-L48)
and it is broken on darwin.
This commit is contained in:
Dmitry Kalinkin 2018-12-10 16:18:38 -05:00
parent 9b07d48d9c
commit facefec139
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -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