gnu: bitcoin-core: Build with modular Qt.

* gnu/packages/finance.scm (bitcoin-core)[native-inputs]: Add QTTOOLS.
[inputs]: Remove QT.  Add QTBASE.
[arguments]: Specify paths to "lrelease" and "lupdate" in #:configure-flags.
master
Marius Bakke 2017-09-22 19:00:08 +02:00
parent 12ae25db45
commit 0193812a3d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 13 additions and 4 deletions

View File

@ -70,7 +70,8 @@
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python) ; for the tests
("util-linux" ,util-linux))) ; provides the hexdump command for tests
("util-linux" ,util-linux) ; provides the hexdump command for tests
("qttools" ,qttools)))
(inputs
`(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload
("boost" ,boost)
@ -78,8 +79,7 @@
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("protobuf" ,protobuf)
;; TODO Build with the modular Qt.
("qt" ,qt)))
("qtbase" ,qtbase)))
(arguments
`(#:configure-flags
(list
@ -87,7 +87,16 @@
"--with-incompatible-bdb"
;; Boost is not found unless specified manually.
(string-append "--with-boost="
(assoc-ref %build-inputs "boost")))
(assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
;; up executables residing in 'qttools', so we specify them here.
(string-append "ac_cv_path_LRELEASE="
(assoc-ref %build-inputs "qttools")
"/bin/lrelease")
(string-append "ac_cv_path_LUPDATE="
(assoc-ref %build-inputs "qttools")
"/bin/lupdate"))
#:phases
(modify-phases %standard-phases
(add-before 'check 'set-home