From f8c560e285a175a7a1c571968974d314397bc2bd Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Mon, 28 Feb 2022 04:59:55 +0100 Subject: [PATCH] netdata: fix protobuf support --- pkgs/tools/system/netdata/default.nix | 2 ++ pkgs/tools/system/netdata/fix-protobuf.patch | 23 ++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/netdata/fix-protobuf.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 0ae4e77910e..d1e3065efd2 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + # This is only needed for 1.33.1, remove on the next release + ./fix-protobuf.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/fix-protobuf.patch b/pkgs/tools/system/netdata/fix-protobuf.patch new file mode 100644 index 00000000000..963e307ec77 --- /dev/null +++ b/pkgs/tools/system/netdata/fix-protobuf.patch @@ -0,0 +1,23 @@ +diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c +index b64a78f29..ccd1c884d 100644 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -60,7 +60,6 @@ + // Optional libraries + + #ifdef HAVE_PROTOBUF +-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE) + #define FEAT_PROTOBUF 1 + #ifdef BUNDLED_PROTOBUF + #define FEAT_PROTOBUF_BUNDLED " (bundled)" +@@ -71,10 +70,6 @@ + #define FEAT_PROTOBUF 0 + #define FEAT_PROTOBUF_BUNDLED "" + #endif +-#else +-#define FEAT_PROTOBUF 0 +-#define FEAT_PROTOBUF_BUNDLED "" +-#endif + + #ifdef ENABLE_JSONC + #define FEAT_JSONC 1