diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-27 21:21:25 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-27 23:48:00 +0200 |
| commit | 9dfd2ad73b80b7eb363b02930f20cc63396ab966 (patch) | |
| tree | 88d19f91990e368b73df21ece90cf325095b37ee /gnu/packages/cmake.scm | |
| parent | 2ada32cc3963afd7f195cb82eade3baf0df2cf1f (diff) | |
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.
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cf930c57fc0..b5812176850 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm | |||
| @@ -171,7 +171,6 @@ using the CMake build system.") | |||
| 171 | (string-append "--parallel=" parallel-job-count) | 171 | (string-append "--parallel=" parallel-job-count) |
| 172 | (string-append "--prefix=" out) | 172 | (string-append "--prefix=" out) |
| 173 | "--system-libs" | 173 | "--system-libs" |
| 174 | "--no-system-jsoncpp" | ||
| 175 | ;; By default, the man pages and other docs land | 174 | ;; By default, the man pages and other docs land |
| 176 | ;; in PREFIX/man and PREFIX/doc, but we want them | 175 | ;; in PREFIX/man and PREFIX/doc, but we want them |
| 177 | ;; in share/{man,doc}. Note that unlike | 176 | ;; in share/{man,doc}. Note that unlike |
| @@ -218,6 +217,7 @@ using the CMake build system.") | |||
| 218 | ("curl" ,curl) | 217 | ("curl" ,curl) |
| 219 | ("expat" ,expat) | 218 | ("expat" ,expat) |
| 220 | ("file" ,file) | 219 | ("file" ,file) |
| 220 | ("jsoncpp" ,jsoncpp) | ||
| 221 | ("libarchive" ,libarchive) | 221 | ("libarchive" ,libarchive) |
| 222 | ,@(if (hurd-target?) | 222 | ,@(if (hurd-target?) |
| 223 | '() | 223 | '() |
| @@ -284,9 +284,6 @@ and workspaces that can be used in the compiler environment of your choice.") | |||
| 284 | "Utilities" | 284 | "Utilities" |
| 285 | lstat) | 285 | lstat) |
| 286 | #t)))) | 286 | #t)))) |
| 287 | (inputs | ||
| 288 | (modify-inputs (package-inputs cmake-bootstrap) | ||
| 289 | (prepend jsoncpp))) | ||
| 290 | (build-system cmake-build-system) | 287 | (build-system cmake-build-system) |
| 291 | (arguments | 288 | (arguments |
| 292 | `(#:configure-flags | 289 | `(#:configure-flags |
