diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-07-29 14:34:43 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-08-04 09:56:03 +0200 |
| commit | cce28b0c3ad14c42e08500bb51b23ba02ed449a2 (patch) | |
| tree | 8a0bc0d4a946837eb5e9673017e1836787ee88b7 | |
| parent | 7972d8a2e98af6592050a37036c2c80a01358fcf (diff) | |
| download | guix-cce28b0c3ad14c42e08500bb51b23ba02ed449a2.tar.gz | |
gnu: qt: Use modify-phases syntax.
* gnu/packages/qt.scm (qt): Use modify-phases syntax.
| -rw-r--r-- | gnu/packages/qt.scm | 79 |
1 files changed, 39 insertions, 40 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d1701c603e..6ef02b1142 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -151,46 +151,45 @@ ;; A more structural fix is needed. #:parallel-build? #f #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* '("configure" "qtbase/configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "qtbase/src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - ;; do not pass "--enable-fast-install", which makes the - ;; configure process fail - (zero? (system* - "./configure" - "-verbose" - "-prefix" out - "-opensource" - "-confirm-license" - ;; Most "-system-..." are automatic, but some use - ;; the bundled copy by default. - "-system-sqlite" - "-system-harfbuzz" - ;; explicitly link with openssl instead of dlopening it - "-openssl-linked" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx" - "-no-avx2" - "-no-mips_dsp" - "-no-mips_dspr2")))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("configure" "qtbase/configure") + (("/bin/pwd") (which "pwd"))) + (substitute* "qtbase/src/corelib/global/global.pri" + (("/bin/ls") (which "ls"))) + ;; do not pass "--enable-fast-install", which makes the + ;; configure process fail + (zero? (system* + "./configure" + "-verbose" + "-prefix" out + "-opensource" + "-confirm-license" + ;; Most "-system-..." are automatic, but some use + ;; the bundled copy by default. + "-system-sqlite" + "-system-harfbuzz" + ;; explicitly link with openssl instead of dlopening it + "-openssl-linked" + ;; explicitly link with dbus instead of dlopening it + "-dbus-linked" + ;; drop special machine instructions not supported + ;; on all instances of the target + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-sse2")) + "-no-sse3" + "-no-ssse3" + "-no-sse4.1" + "-no-sse4.2" + "-no-avx" + "-no-avx2" + "-no-mips_dsp" + "-no-mips_dspr2")))))))) (home-page "http://qt-project.org/") (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for |