From 20d60c8238d407e1e175d06f533b5d99111b6891 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 11 Dec 2018 19:40:28 -0500 Subject: [PATCH] treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is needed --- pkgs/applications/audio/cadence/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 4 ++-- pkgs/applications/misc/electron-cash/default.nix | 2 +- .../networking/instant-messengers/blink/default.nix | 2 +- .../networking/instant-messengers/scudcloud/default.nix | 2 +- .../version-management/git-and-tools/git-cola/default.nix | 4 ++-- pkgs/applications/video/openshot-qt/default.nix | 2 +- pkgs/misc/frescobaldi/default.nix | 5 ++++- pkgs/top-level/python-packages.nix | 1 + 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index f7fa9dbd8615..ef7eeab4b60c 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -25,7 +25,7 @@ DESTDIR=$(out) ''; - propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit ]; postInstall = '' # replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6da1cdefa700..7b01f5c53d77 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow - python pyqt5 sip + python pyqt5_with_qtwebkit sip regex msgpack # the following are distributed with calibre, but we use upstream instead odfpy diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index fff67b0add62..3ba6dfd2da06 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { pbkdf2 pyaes pycrypto - pyqt5 + pyqt5_with_qtwebkit # TODO: qtwebkit not needed? pysocks qrcode requests diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 63dec91dad90..bbdb2ae79f83 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ pyqt5 cjson sipsimple twisted google_api_python_client ]; + propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 441bc020868e..54959383f08e 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage { sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ]; + propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 4b15d03d2007..72bfe87230b6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, gettext, git }: let - inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; + inherit (pythonPackages) buildPythonApplication pyqt5_with_qtwebkit sip pyinotify; in buildPythonApplication rec { name = "git-cola-${version}"; version = "3.2"; @@ -14,7 +14,7 @@ in buildPythonApplication rec { }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip pyinotify ]; + propagatedBuildInputs = [ pyqt5_with_qtwebkit sip pyinotify ]; doCheck = false; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 0905ef5481bb..6f113817058c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 ]; - propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 requests sip httplib2 pyzmq ]; + propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; preConfigure = '' diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index af4c54d9d0d8..df1d623930b5 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -11,7 +11,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; }; - propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ]; + propagatedBuildInputs = with python3Packages; [ + lilypond pygame python-ly + pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; }) + ]; # no tests in shipped with upstream doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7a22f94b53a..2859f2283b9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -614,6 +614,7 @@ in { pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; pysc2 = callPackage ../development/python-modules/pysc2 { };