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

gnu: qt: Use modify-phases syntax. 

* gnu/packages/qt.scm (qt): Use modify-phases syntax.
master
Andreas Enge 2016-07-29 14:34:43 +02:00
parent 7972d8a2e9
commit cce28b0c3a
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
gnu/packages/qt.scm
View File

@ -151,46 +151,45 @@
;; A more structural fix is needed. ;; A more structural fix is needed.
#:parallel-build? #f #:parallel-build? #f
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* '("configure" "qtbase/configure") (substitute* '("configure" "qtbase/configure")
(("/bin/pwd") (which "pwd"))) (("/bin/pwd") (which "pwd")))
(substitute* "qtbase/src/corelib/global/global.pri" (substitute* "qtbase/src/corelib/global/global.pri"
(("/bin/ls") (which "ls"))) (("/bin/ls") (which "ls")))
;; do not pass "--enable-fast-install", which makes the ;; do not pass "--enable-fast-install", which makes the
;; configure process fail ;; configure process fail
(zero? (system* (zero? (system*
"./configure" "./configure"
"-verbose" "-verbose"
"-prefix" out "-prefix" out
"-opensource" "-opensource"
"-confirm-license" "-confirm-license"
;; Most "-system-..." are automatic, but some use ;; Most "-system-..." are automatic, but some use
;; the bundled copy by default. ;; the bundled copy by default.
"-system-sqlite" "-system-sqlite"
"-system-harfbuzz" "-system-harfbuzz"
;; explicitly link with openssl instead of dlopening it ;; explicitly link with openssl instead of dlopening it
"-openssl-linked" "-openssl-linked"
;; explicitly link with dbus instead of dlopening it ;; explicitly link with dbus instead of dlopening it
"-dbus-linked" "-dbus-linked"
;; drop special machine instructions not supported ;; drop special machine instructions not supported
;; on all instances of the target ;; on all instances of the target
,@(if (string-prefix? "x86_64" ,@(if (string-prefix? "x86_64"
(or (%current-target-system) (or (%current-target-system)
(%current-system))) (%current-system)))
'() '()
'("-no-sse2")) '("-no-sse2"))
"-no-sse3" "-no-sse3"
"-no-ssse3" "-no-ssse3"
"-no-sse4.1" "-no-sse4.1"
"-no-sse4.2" "-no-sse4.2"
"-no-avx" "-no-avx"
"-no-avx2" "-no-avx2"
"-no-mips_dsp" "-no-mips_dsp"
"-no-mips_dspr2")))) "-no-mips_dspr2"))))))))
%standard-phases)))
(home-page "http://qt-project.org/") (home-page "http://qt-project.org/")
(synopsis "Cross-platform GUI library") (synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for (description "Qt is a cross-platform application and UI framework for