Unverified Commit fcc4d464 authored by Wout Mertens's avatar Wout Mertens Committed by GitHub
Browse files

Merge pull request #162152 from wmertens/netdata-protobuf-fix 

netdata: fix protobuf support
parents 102c02f4 f8c560e2

pkgs/tools/system/netdata/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/tools/system/netdata/fix-protobuf.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
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