diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 17:00:30 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 17:00:30 +0200 |
| commit | c6d02bcf1bcc06c70e440221e317274926c0fce3 (patch) | |
| tree | 1698bf3728b013961cfdd14f731b4a55d1f409c0 /gnu/packages/qt.scm | |
| parent | 2a2a9878682e4d959633ecab5275397809a1ce3f (diff) | |
| parent | 658505d7a92f0518e1fc4c965bdaa389a6e83f2c (diff) | |
| download | guix-c6d02bcf1bcc06c70e440221e317274926c0fce3.tar guix-c6d02bcf1bcc06c70e440221e317274926c0fce3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/qt.scm')
| -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 a3797bb5b0..238caa117d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2049,7 +2049,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 @@ -2059,13 +2062,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"))) @@ -2084,7 +2082,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 |