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

gnu: qt@4: Use invoke. 

* gnu/packages/qt.scm (qt@4)[arguments]: Use invoke.
master
Efraim Flashner 2018-10-21 10:07:35 +03:00
parent 1f71daf499
commit 852a5692bb
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
gnu/packages/qt.scm
View File

@ -433,50 +433,50 @@ system, and the core design of Django is reused in Grantlee.")
(substitute* "src/corelib/global/global.pri" (substitute* "src/corelib/global/global.pri"
(("/bin/ls") (which "ls"))) (("/bin/ls") (which "ls")))
(zero? (system* (invoke
"./configure" "./configure"
"-verbose" "-verbose"
"-prefix" out "-prefix" out
"-nomake" "examples demos" "-nomake" "examples demos"
;; Note: Don't pass '-docdir' since 'qmake' and ;; Note: Don't pass '-docdir' since 'qmake' and
;; libQtCore would record its value, thereby defeating ;; libQtCore would record its value, thereby defeating
;; the whole point of having a separate output. ;; the whole point of having a separate output.
"-datadir" (string-append out "/share/qt-" ,version "-datadir" (string-append out "/share/qt-" ,version
"/data") "/data")
"-importdir" (string-append out "/lib/qt-4" "-importdir" (string-append out "/lib/qt-4"
"/imports") "/imports")
"-plugindir" (string-append out "/lib/qt-4" "-plugindir" (string-append out "/lib/qt-4"
"/plugins") "/plugins")
"-translationdir" (string-append out "/share/qt-" ,version "-translationdir" (string-append out "/share/qt-" ,version
"/translations") "/translations")
"-demosdir" (string-append out "/share/qt-" ,version "-demosdir" (string-append out "/share/qt-" ,version
"/demos") "/demos")
"-examplesdir" (string-append out "/share/qt-" ,version "-examplesdir" (string-append out "/share/qt-" ,version
"/examples") "/examples")
"-opensource" "-opensource"
"-confirm-license" "-confirm-license"
;; explicitly link with dbus instead of dlopening it ;; explicitly link with dbus instead of dlopening it
"-dbus-linked" "-dbus-linked"
;; Skip the webkit module; it fails to build on armhf ;; Skip the webkit module; it fails to build on armhf
;; and, apart from that, may pose security risks. ;; and, apart from that, may pose security risks.
"-no-webkit" "-no-webkit"
;; don't use the precompiled headers ;; don't use the precompiled headers
"-no-pch" "-no-pch"
;; 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-mmx" '("-no-mmx"
"-no-3dnow" "-no-3dnow"
"-no-sse" "-no-sse"
"-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"))))
(add-after (add-after
'install 'move-doc 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)