treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is needed
This commit is contained in:
parent
3c198294e7
commit
20d60c8238
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
|||
pbkdf2
|
||||
pyaes
|
||||
pycrypto
|
||||
pyqt5
|
||||
pyqt5_with_qtwebkit # TODO: qtwebkit not needed?
|
||||
pysocks
|
||||
qrcode
|
||||
requests
|
||||
|
|
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue