about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/system/netdata/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-10-21 17:25:23 +0000
committerAlyssa Ross <hi@alyssa.is>2023-10-21 17:25:23 +0000
commit2a87a287685e127797106ffe684015a2371729fd (patch)
tree86f3180cc4eea397d9741a530593682404e94627 /nixpkgs/pkgs/tools/system/netdata/default.nix
parent53533fd13b70e6e78e9a63c7dad027b116335a2d (diff)
parent83b8726e5f6f85a28405c7772f75093fd9a399a3 (diff)
downloadnixlib-2a87a287685e127797106ffe684015a2371729fd.tar
nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.gz
nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.bz2
nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.lz
nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.xz
nixlib-2a87a287685e127797106ffe684015a2371729fd.tar.zst
nixlib-2a87a287685e127797106ffe684015a2371729fd.zip
Merge commit '83b8726e5f6f85a28405c7772f75093fd9a399a3'
Diffstat (limited to 'nixpkgs/pkgs/tools/system/netdata/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/system/netdata/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix
index 5d9286a1c4d1..8ca73a4faf8c 100644
--- a/nixpkgs/pkgs/tools/system/netdata/default.nix
+++ b/nixpkgs/pkgs/tools/system/netdata/default.nix
@@ -2,13 +2,13 @@
 , CoreFoundation, IOKit, libossp_uuid
 , nixosTests
 , netdata-go-plugins
-, bash, curl, jemalloc, libuv, zlib, libyaml
+, bash, curl, jemalloc, json_c, libuv, zlib, libyaml
 , libcap, libuuid, lm_sensors, protobuf
 , withCups ? false, cups
 , withDBengine ? true, lz4
 , withIpmi ? (!stdenv.isDarwin), freeipmi
 , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
-, withCloud ? (!stdenv.isDarwin), json_c
+, withCloud ? false
 , withCloudUi ? false
 , withConnPubSub ? false, google-cloud-cpp, grpc
 , withConnPrometheus ? false, snappy
@@ -42,14 +42,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ];
   # bash is only used to rewrite shebangs
-  buildInputs = [ bash curl jemalloc libuv zlib libyaml ]
+  buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ]
     ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
     ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ]
     ++ lib.optionals withCups [ cups ]
     ++ lib.optionals withDBengine [ lz4 ]
     ++ lib.optionals withIpmi [ freeipmi ]
     ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ]
-    ++ lib.optionals withCloud [ json_c ]
     ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ]
     ++ lib.optionals withConnPrometheus [ snappy ]
     ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ]