nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python-sip, python-pyqt: Fix computation of python library path. 

* gnu/packages/qt.scm (python-sip, python2-sip, python-pyqt, python2-pyqt,
    python-pyqt-4, python2-pyqt-4)[arguments]: Fix computation of python
    library path for multi-digit python versions.
master
Andreas Enge 2015-08-11 15:41:35 +02:00
parent bc459b617f
commit e8bdd73ac6
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnu/packages/qt.scm
View File

@ -339,6 +339,8 @@ developers using C++ or QML, a CSS & JavaScript like language.")
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:modules ((srfi srfi-1)
,@%gnu-build-system-modules)
#:phases #:phases
(alist-replace (alist-replace
'configure 'configure
@ -346,12 +348,15 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(include (string-append out "/include")) (include (string-append out "/include"))
(python (assoc-ref inputs "python"))
(python-version (python-version
(string-take (last (string-split python #\-)))
(string-take-right (assoc-ref inputs "python") 5) (python-major+minor
3)) (string-join
(take (string-split python-version #\.) 2)
"."))
(lib (string-append out "/lib/python" (lib (string-append out "/lib/python"
python-version python-major+minor
"/site-packages"))) "/site-packages")))
(zero? (zero?
(system* "python" "configure.py" (system* "python" "configure.py"
@ -402,7 +407,9 @@ module provides support functions to the automatically generated code.")
(inputs (inputs
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))
(arguments (arguments
`(#:phases `(#:modules ((srfi srfi-1)
,@%gnu-build-system-modules)
#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -412,12 +419,15 @@ module provides support functions to the automatically generated code.")
(plugins (string-append out "/plugins")) (plugins (string-append out "/plugins"))
(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-version (python-version
(string-take (last (string-split python #\-)))
(string-take-right (assoc-ref inputs "python") 5) (python-major+minor
3)) (string-join
(take (string-split python-version #\.) 2)
"."))
(lib (string-append out "/lib/python" (lib (string-append out "/lib/python"
python-version python-major+minor
"/site-packages"))) "/site-packages")))
(zero? (system* "python" "configure.py" (zero? (system* "python" "configure.py"
"--confirm-license" "--confirm-license"
@ -463,6 +473,8 @@ contain over 620 classes.")
("qt" ,qt-4))) ("qt" ,qt-4)))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:modules ((srfi srfi-1)
,@%gnu-build-system-modules)
#:phases #:phases
(alist-replace (alist-replace
'configure 'configure
@ -470,12 +482,15 @@ contain over 620 classes.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(sip (string-append out "/share/sip")) (sip (string-append out "/share/sip"))
(python (assoc-ref inputs "python"))
(python-version (python-version
(string-take (last (string-split python #\-)))
(string-take-right (assoc-ref inputs "python") 5) (python-major+minor
3)) (string-join
(take (string-split python-version #\.) 2)
"."))
(lib (string-append out "/lib/python" (lib (string-append out "/lib/python"
python-version python-major+minor
"/site-packages"))) "/site-packages")))
(zero? (system* "python" "configure.py" (zero? (system* "python" "configure.py"
"--confirm-license" "--confirm-license"