pyrox.dev
Merge pull request #162152 from wmertens/netdata-protobuf-fix
netdata: fix protobuf support
authored by Wout Mertens and committed by GitHub fcc4d464 102c02f4
+2
pkgs/tools/system/netdata/default.nix
+2
pkgs/tools/system/netdata/default.nix
···
47
# Therefore we put it into `/run/netdata`, which is owned
48
# by netdata only.
49
./ipc-socket-in-run.patch
50
+
# This is only needed for 1.33.1, remove on the next release
51
+
./fix-protobuf.patch
52
];
53
54
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
+23
pkgs/tools/system/netdata/fix-protobuf.patch
+23
pkgs/tools/system/netdata/fix-protobuf.patch
···
···
1
+
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c
2
+
index b64a78f29..ccd1c884d 100644
3
+
--- a/daemon/buildinfo.c
4
+
+++ b/daemon/buildinfo.c
5
+
@@ -60,7 +60,6 @@
6
+
// Optional libraries
7
+
8
+
#ifdef HAVE_PROTOBUF
9
+
-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE)
10
+
#define FEAT_PROTOBUF 1
11
+
#ifdef BUNDLED_PROTOBUF
12
+
#define FEAT_PROTOBUF_BUNDLED " (bundled)"
13
+
@@ -71,10 +70,6 @@
14
+
#define FEAT_PROTOBUF 0
15
+
#define FEAT_PROTOBUF_BUNDLED ""
16
+
#endif
17
+
-#else
18
+
-#define FEAT_PROTOBUF 0
19
+
-#define FEAT_PROTOBUF_BUNDLED ""
20
+
-#endif
21
+
22
+
#ifdef ENABLE_JSONC
23
+
#define FEAT_JSONC 1