[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/15: gnu: CMake: Bootstrap with system jsoncpp.
From: |
guix-commits |
Subject: |
11/15: gnu: CMake: Bootstrap with system jsoncpp. |
Date: |
Mon, 27 Jun 2022 17:50:02 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9dfd2ad73b80b7eb363b02930f20cc63396ab966
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jun 27 21:21:25 2022 +0200
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.
---
gnu/packages/cmake.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index cf930c57fc..b581217685 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -171,7 +171,6 @@ using the CMake build system.")
(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 @@ using the CMake build system.")
("curl" ,curl)
("expat" ,expat)
("file" ,file)
+ ("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
,@(if (hurd-target?)
'()
@@ -284,9 +284,6 @@ and workspaces that can be used in the compiler environment
of your choice.")
"Utilities"
lstat)
#t))))
- (inputs
- (modify-inputs (package-inputs cmake-bootstrap)
- (prepend jsoncpp)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
- 09/15: gnu: doxygen: Use new style., (continued)
- 09/15: gnu: doxygen: Use new style., guix-commits, 2022/06/27
- 12/15: gnu: libjpeg-turbo: Build with cmake-minimal., guix-commits, 2022/06/27
- 05/15: gnu: icu4c: Update to 71.1., guix-commits, 2022/06/27
- 07/15: gnu: harfbuzz: Remove input labels., guix-commits, 2022/06/27
- 13/15: gnu: CMake: Remove input labels., guix-commits, 2022/06/27
- 15/15: gnu: CMake: Update to 3.23.2., guix-commits, 2022/06/27
- 10/15: gnu: jsoncpp: Build with Meson., guix-commits, 2022/06/27
- 14/15: gnu: CMake: Use G-expressions., guix-commits, 2022/06/27
- 02/15: gnu: python-libxml2: Fix build failure., guix-commits, 2022/06/27
- 06/15: gnu: harfbuzz: Update to 4.3.0., guix-commits, 2022/06/27
- 11/15: gnu: CMake: Bootstrap with system jsoncpp.,
guix-commits <=
- 08/15: gnu: doxygen: Update to 1.9.4., guix-commits, 2022/06/27