gnu: CMake: Bootstrap with system jsoncpp.

* gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Remove
"--no-system-jsoncpp" from #:configure-flags.
[inputs]: Add JSONCPP.
(cmake-minimal)[inputs]: Remove.
This commit is contained in:
Marius Bakke 2022-06-27 21:21:25 +02:00
parent 2ada32cc39
commit 9dfd2ad73b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -171,7 +171,6 @@ (define-public cmake-bootstrap
(string-append "--parallel=" parallel-job-count)
(string-append "--prefix=" out)
"--system-libs"
"--no-system-jsoncpp"
;; By default, the man pages and other docs land
;; in PREFIX/man and PREFIX/doc, but we want them
;; in share/{man,doc}. Note that unlike
@ -218,6 +217,7 @@ (define-public cmake-bootstrap
("curl" ,curl)
("expat" ,expat)
("file" ,file)
("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
,@(if (hurd-target?)
'()
@ -284,9 +284,6 @@ (define preserved-files ',%preserved-third-party-files)
"Utilities"
lstat)
#t))))
(inputs
(modify-inputs (package-inputs cmake-bootstrap)
(prepend jsoncpp)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags