From 45ed9e44ca4651c7be766e653209248961803f20 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 14 Aug 2022 10:02:00 +0800 Subject: [PATCH 1/3] netdata: remove judy from buildInputs as it is vendored by upstream --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 751725eec6b..0a4b5bc5514 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -4,7 +4,7 @@ , curl, jemalloc, libuv, zlib , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups -, withDBengine ? true, judy, lz4 +, withDBengine ? true, lz4 , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withCloud ? (!stdenv.isDarwin), json_c @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] - ++ optionals withDBengine [ judy lz4.dev ] + ++ optionals withDBengine [ lz4 ] ++ optionals withIpmi [ freeipmi ] ++ optionals withNetfilter [ libmnl libnetfilter_acct ] ++ optionals withCloud [ json_c ] From c31ccef68094aeed816b001b2a5b43e8be73bf15 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Oct 2022 13:44:39 +0800 Subject: [PATCH 2/3] netdata: cleanup unnecessary .dev in buildInputs --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 0a4b5bc5514..33932474f31 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -33,9 +33,9 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; - buildInputs = [ curl.dev jemalloc libuv zlib.dev ] + buildInputs = [ curl jemalloc libuv zlib ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] + ++ optionals (!stdenv.isDarwin) [ libcap libuuid ] ++ optionals withCups [ cups ] ++ optionals withDBengine [ lz4 ] ++ optionals withIpmi [ freeipmi ] @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ++ optionals withConnPubSub [ google-cloud-cpp grpc ] ++ optionals withConnPrometheus [ snappy ] ++ optionals (withCloud || withConnPrometheus) [ protobuf ] - ++ optionals withSsl [ openssl.dev ]; + ++ optionals withSsl [ openssl ]; patches = [ # required to prevent plugins from relying on /etc From 8344bf1ac2485c6e0d7132bc66156a6705128d69 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Oct 2022 13:48:15 +0800 Subject: [PATCH 3/3] netdata: mark broken for cross compilation --- pkgs/tools/system/netdata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 33932474f31..7909c47c8ee 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { }; meta = { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; license = licenses.gpl3Plus;