From 9dfd2ad73b80b7eb363b02930f20cc63396ab966 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Jun 2022 21:21:25 +0200 Subject: [PATCH] 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 @@ (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