diff options
| author | Milan Pässler <milan@petabyte.dev> | 2020-07-30 14:06:52 +0200 |
|---|---|---|
| committer | Milan <me@pbb.lc> | 2020-07-31 18:50:58 +0200 |
| commit | ae661388c6fdbdaa206fab8684f6a603201cf78f (patch) | |
| tree | 93bdbf989d1596813697976de1ff9fbe6edbeeaa /pkgs | |
| parent | cb1b5351e45a104ef92a12527930eb306a2a489b (diff) | |
| download | nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar.gz nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar.bz2 nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar.lz nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar.xz nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.tar.zst nixpkgs-ae661388c6fdbdaa206fab8684f6a603201cf78f.zip | |
pyqtwebengine: add patch to fix build with Qt 5.14
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pyqtwebengine/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch | 31 |
2 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index c4e10910db8..ff511103e55 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -18,6 +18,11 @@ in buildPythonPackage rec { sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; + patches = [ + # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html + ./fix-build-with-qt-514.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch b/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch new file mode 100644 index 00000000000..1ae911c1481 --- /dev/null +++ b/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch @@ -0,0 +1,31 @@ +diff --git a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip +index 5fb508f..7a4654a 100644 +--- a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip ++++ b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip +@@ -48,7 +48,7 @@ public: + %If (QtWebEngine_5_8_0 -) + CertificateTransparencyRequired, + %End +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + CertificateKnownInterceptionBlocked, + %End + }; +diff --git a/sip/QtWebEngineWidgets/qwebenginepage.sip b/sip/QtWebEngineWidgets/qwebenginepage.sip +index 0dcbed2..9aa3443 100644 +--- a/sip/QtWebEngineWidgets/qwebenginepage.sip ++++ b/sip/QtWebEngineWidgets/qwebenginepage.sip +@@ -663,10 +663,10 @@ signals: + %End + + public: +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + qint64 renderProcessPid() const; + %End +-%If (QtWebEngine_5_14_0 -) ++%If (QtWebEngine_5_15_0 -) + void renderProcessPidChanged(qint64 pid); + %End + }; + |