me/guix
Archived
1
0
Fork 0
Code Activity

gnu: CMake: Bootstrap with system jsoncpp.

Browse source 
* 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
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/cmake.scm
View file

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