From e81bba8f5586114816003066358b2a83627e5987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= <esm@eduardosm.net>
Date: Mon, 17 May 2021 11:30:30 +0200
Subject: [PATCH] python3Packages.pyqtwebengine: build using `pyproject`

---
 .../python-modules/pyqtwebengine/default.nix  | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index ce25bc04a136..75a3e3eb9344 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -5,7 +5,7 @@
 
 let
 
-  inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34;
+  inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34 pyqt-builder;
   inherit (pyqt5) sip;
   # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
   patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version)
@@ -15,7 +15,7 @@ let
 in buildPythonPackage rec {
   pname = "PyQtWebEngine";
   version = "5.15.4";
-  format = "other";
+  format = if isPy3k then "pyproject" else "other";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
@@ -24,6 +24,11 @@ in buildPythonPackage rec {
 
   inherit patches;
 
+  postPatch = lib.optionalString isPy3k ''
+    substituteInPlace pyproject.toml \
+      --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]"
+  '';
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
@@ -33,7 +38,7 @@ in buildPythonPackage rec {
     qtbase
     qtsvg
     qtwebengine
-  ];
+  ] ++ lib.optional isPy3k pyqt-builder;
 
   buildInputs = [
     sip
@@ -47,6 +52,9 @@ in buildPythonPackage rec {
 
   dontWrapQtApps = true;
 
+  # Configure only needed when building with sip 4 (python 2)
+  dontConfigure = isPy3k;
+
   configurePhase = ''
     runHook preConfigure
 
@@ -65,7 +73,7 @@ in buildPythonPackage rec {
     runHook postConfigure
   '';
 
-  postInstall = ''
+  postInstall = lib.optionalString (!isPy3k) ''
     # Let's make it a namespace package
     cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
     from pkgutil import extend_path
@@ -73,18 +81,13 @@ in buildPythonPackage rec {
     EOF
   '';
 
-  installCheckPhase = let
-    modules = [
-      "PyQt5.QtWebEngine"
-      "PyQt5.QtWebEngineWidgets"
-    ];
-    imports = lib.concatMapStrings (module: "import ${module};") modules;
-  in ''
-    echo "Checking whether modules can be imported..."
-    PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.interpreter} -c "${imports}"
-  '';
+  # Checked using pythonImportsCheck
+  doCheck = false;
 
-  doCheck = true;
+  pythonImportsCheck = [
+    "PyQt5.QtWebEngine"
+    "PyQt5.QtWebEngineWidgets"
+  ];
 
   enableParallelBuilding = true;