mbakke pushed a commit to branch staging
in repository guix.
commit 3c48fe3658474492307d76f400dc22c98d2a05b7
Author: Marius Bakke <[email protected]>
AuthorDate: Sun Jun 7 22:41:14 2020 +0200
gnu: python-pyqt: Use PYTHON-VERSION.
* gnu/packages/qt.scm (python-pyqt)[arguments]: Add #:modules. Use
PYTHON-VERSION from PYTHON-BUILD-SYSTEM instead of custom implementation.
---
gnu/packages/qt.scm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 17f7c8e..fb9643b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1984,7 +1984,10 @@ module provides support functions to the automatically
generated code.")
("qtxmlpatterns" ,qtxmlpatterns)))
(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
;; When building python-pyqtwebengine, <qprinter.h> can not be
@@ -2007,14 +2010,8 @@ module provides support functions to the automatically
generated code.")
(designer (string-append plugins "/designer"))
(qml (string-append plugins "/PyQt5"))
(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"))
(stubs (string-append lib "/PyQt5")))
(invoke "python" "configure.py"
