mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 06:06:53 -05:00
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.
This commit is contained in:
parent
12ae25db45
commit
0193812a3d
1 changed files with 13 additions and 4 deletions
|
@ -70,7 +70,8 @@ (define-public bitcoin-core
|
|||
(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 @@ (define-public bitcoin-core
|
|||
("miniupnpc" ,miniupnpc)
|
||||
("openssl" ,openssl)
|
||||
("protobuf" ,protobuf)
|
||||
;; TODO Build with the modular Qt.
|
||||
("qt" ,qt)))
|
||||
("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list
|
||||
|
@ -87,7 +87,16 @@ (define-public bitcoin-core
|
|||
"--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
|
||||
|
|
Loading…
Reference in a new issue