me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2020-06-07 22:41:14 +02:00
parent fd702f8e95
commit 3c48fe3658
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/qt.scm
View File

@ -1984,7 +1984,10 @@ module provides support functions to the automatically generated code.")
("qtxmlpatterns" ,qtxmlpatterns))) ("qtxmlpatterns" ,qtxmlpatterns)))
(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
;; When building python-pyqtwebengine, <qprinter.h> can not be ;; 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")) (designer (string-append plugins "/designer"))
(qml (string-append plugins "/PyQt5")) (qml (string-append plugins "/PyQt5"))
(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")) "/site-packages"))
(stubs (string-append lib "/PyQt5"))) (stubs (string-append lib "/PyQt5")))
(invoke "python" "configure.py" (invoke "python" "configure.py"