mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-28 07:12:30 -05:00
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:
parent
2ada32cc39
commit
9dfd2ad73b
1 changed files with 1 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue