uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
71
pkgs/development/python-modules/pyqtwebengine/default.nix
Normal file
71
pkgs/development/python-modules/pyqtwebengine/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ lib, pythonPackages, pkg-config
|
||||
, qmake, qtbase, qtsvg, qtwebengine
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder;
|
||||
in buildPythonPackage rec {
|
||||
pname = "PyQtWebEngine";
|
||||
version = "5.15.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
sip
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebengine
|
||||
pyqt-builder
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sip
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# Avoid running qmake, which is in nativeBuildInputs
|
||||
dontConfigure = true;
|
||||
|
||||
# Checked using pythonImportsCheck
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"PyQt5.QtWebEngine"
|
||||
"PyQt5.QtWebEngineWidgets"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
inherit wrapQtAppsHook;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Qt5";
|
||||
homepage = "http://www.riverbankcomputing.co.uk";
|
||||
license = licenses.gpl3;
|
||||
platforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
};
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue