From 4d97677690292acae6406d977353661215ddb23c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 22 Feb 2021 22:20:54 +1100 Subject: [PATCH 4/4] pyqtwebengine --- gnu/packages/qt.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 33b60a74d1..56fa9f18ec 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2098,9 +2098,11 @@ contain over 620 classes.") (build-system gnu-build-system) (native-inputs `(("python" ,python) - ("python-sip" ,python-sip) + ;; ("python-pyqt5-sip" ,python-pyqt5-sip) ;;; XXX do we need it? + ("python-pyqt-builder" ,python-pyqt-builder) ;; qtbase is required for qmake - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase) + ("strace" ,strace))) (inputs `(("python" ,python-wrapper) ("python-sip" ,python-sip) @@ -2116,6 +2118,7 @@ contain over 620 classes.") ,@%gnu-build-system-modules) #:imported-modules ((guix build python-build-system) ,@%gnu-build-system-modules) + #:make-flags (list (string-append "INSTALL_ROOT=" %output)) #:phases (modify-phases %standard-phases (replace 'configure @@ -2128,19 +2131,19 @@ contain over 620 classes.") (lib (string-append out "/lib/python" (python-version python) "/site-packages/PyQt5")) + (lib* (string-append "/lib/python" + (python-version python) + "/site-packages/PyQt5")) (stubs (string-append lib "/PyQt5"))) - (mkdir-p sipdir) - (invoke "python" "configure.py" - "-w" - "--no-dist-info" - "--destdir" lib - "--no-qsci-api" - "--stubsdir" stubs - "--sipdir" sipdir - "--pyqt-sipdir" pyqt-sipdir)))) + (invoke "strace" + "sip-build" + "--no-make" + "--target-dir" lib*)))) ;; Because this has a different prefix than python-pyqt then we need ;; to make this a namespace of it's own + (add-before 'build 'chdir + (lambda _ (chdir "build"))) (add-after 'install 'make-namespace (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((__init__.py (string-append -- 2.30.1