me
/
guix
Archived
1
0
Fork 0
Code

gnu: python-pyqtwebengine: Use 'python-version'. 

* gnu/packages/qt.scm (python-pyqtwebengine)[arguments]: Add (guix build
python-build-system) to #:modules.  Adjust #:imported-modules accordingly.
Rewrite #:phases to use it instead of rolling their own, or hard-coding.
master
Marius Bakke 2020-04-11 15:16:46 +02:00
parent fbfaba8a7c
commit 67950de7e8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/qt.scm
View File

@ -2040,7 +2040,10 @@ contain over 620 classes.")
("qtwebengine" ,qtwebengine))) ("qtwebengine" ,qtwebengine)))
(arguments (arguments
`(#:modules ((srfi srfi-1) `(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -2050,13 +2053,8 @@ contain over 620 classes.")
(pyqt-sipdir (string-append (pyqt-sipdir (string-append
(assoc-ref inputs "python-pyqt") "/share/sip")) (assoc-ref inputs "python-pyqt") "/share/sip"))
(python (assoc-ref inputs "python")) (python (assoc-ref inputs "python"))
(python-version
(last (string-split python #\-)))
(python-major+minor
(string-join
(take (string-split python-version #\.) 2) "."))
(lib (string-append out "/lib/python" (lib (string-append out "/lib/python"
python-major+minor (python-version python)
"/site-packages/PyQt5")) "/site-packages/PyQt5"))
(stubs (string-append lib "/PyQt5"))) (stubs (string-append lib "/PyQt5")))
@ -2075,7 +2073,9 @@ contain over 620 classes.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((__init__.py (string-append (let* ((__init__.py (string-append
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/lib/python3.7/site-packages/PyQt5/__init__.py"))) "/lib/python"
(python-version (assoc-ref inputs "python"))
"/site-packages/PyQt5/__init__.py")))
(with-output-to-file __init__.py (with-output-to-file __init__.py
(lambda _ (display " (lambda _ (display "
from pkgutil import extend_path from pkgutil import extend_path