summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-03-13 23:28:15 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-03-17 12:59:53 +0100
commit5dd9b0ef12c63f8efc3c18bb0361d56423b84804 (patch)
treecfa121c21ca3937dcba4b90137f9c881e1540844
parent5deeda4b8199cc32c81d9af421472055ecae0e5f (diff)
Include nlohmann-json in cmake-bootstrap
-rw-r--r--private/komodo/cmake.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/private/komodo/cmake.scm b/private/komodo/cmake.scm
index bdaca09c35..108ad21cee 100644
--- a/private/komodo/cmake.scm
+++ b/private/komodo/cmake.scm
@@ -44,6 +44,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages backup)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
@@ -185,6 +186,7 @@ using the CMake build system.")
(string-append "--parallel=" parallel-job-count)
(string-append "--prefix=" #$output)
"--system-libs"
+ "--no-system-cppdap"
;; 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
@@ -237,7 +239,9 @@ using the CMake build system.")
"!defined(__GNU__)")))))
#~()))))
(inputs
- (list libuv bzip2 cppdap curl expat file jsoncpp libarchive rhash zlib))
+ (list
+ libuv bzip2 cppdap curl expat file jsoncpp libarchive nlohmann-json rhash
+ zlib))
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")