b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pythonPackages.pyqtwebengine: Apply qt5.14 patch only if needed

Browse source 
Since we now use qt5.15 in all python modules (defaulting to the same
qt5 used in all-packages.nix), That patch is not required, but it will
be needed if qt5.14 is used if pythonInterpreters is overridden, which
is likely to happen like it happend to qutebrowser for instance. See:
2667af4062
This commit is contained in:
Doron Behar 2020-10-07 18:14:02 +03:00 committed by Frederik Rietdijk
parent 4bccbd9592
commit 15bfdf8e51
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/python-modules/pyqtwebengine/default.nix
View file

@ -7,6 +7,10 @@ let
inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34;
inherit (pyqt5) sip;
# source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version)
[ ./fix-build-with-qt-514.patch ]
;
in buildPythonPackage rec {
pname = "PyQtWebEngine";
@ -18,10 +22,7 @@ in buildPythonPackage rec {
sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237";
};
patches = [
# source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
./fix-build-with-qt-514.patch
];
inherit patches;
outputs = [ "out" "dev" ];