netdata: fix protobuf support
This commit is contained in:
parent
ffd3ac8e81
commit
f8c560e285
|
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
|
||||||
# Therefore we put it into `/run/netdata`, which is owned
|
# Therefore we put it into `/run/netdata`, which is owned
|
||||||
# by netdata only.
|
# by netdata only.
|
||||||
./ipc-socket-in-run.patch
|
./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";
|
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||||
|
|
23
pkgs/tools/system/netdata/fix-protobuf.patch
Normal file
23
pkgs/tools/system/netdata/fix-protobuf.patch
Normal file
|
@ -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
|
Loading…
Reference in a new issue