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

treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is needed

Browse Source
This commit is contained in:
Dmitry Kalinkin 2018-12-11 19:40:28 -05:00
parent 3c198294e7
commit 20d60c8238
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/cadence/default.nix
View File

@ -25,7 +25,7 @@
DESTDIR=$(out) DESTDIR=$(out)
''; '';
propagatedBuildInputs = with python3Packages; [ pyqt5 ]; propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit ];
postInstall = '' postInstall = ''
# replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise # replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise

4
pkgs/applications/misc/calibre/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
prePatch = '' 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 setup/build_environment.py
# Remove unneeded files and libs # Remove unneeded files and libs
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [ ] ++ (with python2Packages; [
apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow
python pyqt5 sip python pyqt5_with_qtwebkit sip
regex msgpack regex msgpack
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead
odfpy odfpy

2
pkgs/applications/misc/electron-cash/default.nix
View File

@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
pbkdf2 pbkdf2
pyaes pyaes
pycrypto pycrypto
pyqt5 pyqt5_with_qtwebkit # TODO: qtwebkit not needed?
pysocks pysocks
qrcode qrcode
requests requests

2
pkgs/applications/networking/instant-messengers/blink/default.nix
View File

@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py 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 ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];

2
pkgs/applications/networking/instant-messengers/scudcloud/default.nix
View File

@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage {
sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22";
}; };
propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ]; propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Non-official desktop client for Slack"; description = "Non-official desktop client for Slack";

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }: { stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
let let
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; inherit (pythonPackages) buildPythonApplication pyqt5_with_qtwebkit sip pyinotify;
in buildPythonApplication rec { in buildPythonApplication rec {
name = "git-cola-${version}"; name = "git-cola-${version}";
version = "3.2"; version = "3.2";
@ -14,7 +14,7 @@ in buildPythonApplication rec {
}; };
buildInputs = [ git gettext ]; buildInputs = [ git gettext ];
propagatedBuildInputs = [ pyqt5 sip pyinotify ]; propagatedBuildInputs = [ pyqt5_with_qtwebkit sip pyinotify ];
doCheck = false; doCheck = false;

2
pkgs/applications/video/openshot-qt/default.nix
View File

@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 requests sip httplib2 pyzmq ]; propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ];
preConfigure = '' preConfigure = ''

5
pkgs/misc/frescobaldi/default.nix
View File

@ -11,7 +11,10 @@ python3Packages.buildPythonApplication rec {
sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; 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 # no tests in shipped with upstream
doCheck = false; doCheck = false;

1
pkgs/top-level/python-packages.nix
View File

@ -614,6 +614,7 @@ in {
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self; pythonPackages = self;
}; };
pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
pysc2 = callPackage ../development/python-modules/pysc2 { }; pysc2 = callPackage ../development/python-modules/pysc2 { };