diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 15:16:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 15:51:07 +0200 |
| commit | 67950de7e8a1ef6e142bb1a05cdff9155b85e227 (patch) | |
| tree | a2e9d32e7a93182c4003a5106ad071bd77603a1d /gnu | |
| parent | fbfaba8a7c4519298879df2789d1900314486cae (diff) | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/qt.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8696dc4bb6..9c517d0acf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2040,7 +2040,10 @@ contain over 620 classes.") ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) + ((guix build python-build-system) #:select (python-version)) ,@%gnu-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -2050,13 +2053,8 @@ contain over 620 classes.") (pyqt-sipdir (string-append (assoc-ref inputs "python-pyqt") "/share/sip")) (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" - python-major+minor + (python-version python) "/site-packages/PyQt5")) (stubs (string-append lib "/PyQt5"))) @@ -2075,7 +2073,9 @@ contain over 620 classes.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((__init__.py (string-append (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 (lambda _ (display " from pkgutil import extend_path |