Skip to content

Commit b292d60

Browse files
authoredDec 21, 2018
Revert "collectd: fix build with lm_sensors"
1 parent e0561cb commit b292d60

File tree

1 file changed

+41
-52
lines changed

1 file changed

+41
-52
lines changed
 

‎pkgs/tools/system/collectd/default.nix

+41-52
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
11
{ stdenv, fetchurl, fetchpatch, darwin
2-
, autoreconfHook
3-
, pkgconfig
4-
, curl
5-
, iptables
6-
, jdk
7-
, libapparmor
8-
, libatasmart
9-
, libcap_ng
10-
, libcredis
11-
, libdbi
12-
, libgcrypt
13-
, libmemcached, cyrus_sasl
14-
, libmicrohttpd
15-
, libmodbus
16-
, libnotify, gdk_pixbuf
17-
, liboping
18-
, libpcap
19-
, libsigrok
20-
, libvirt
21-
, libxml2
22-
, libtool
23-
, lm_sensors
24-
, lvm2
25-
, mysql
26-
, numactl
27-
, postgresql
28-
, protobufc
29-
, python
30-
, rabbitmq-c
31-
, riemann_c_client
32-
, rrdtool
33-
, udev
34-
, varnish
35-
, yajl
36-
, net_snmp
37-
, hiredis
38-
, libmnl
39-
, mosquitto
40-
, rdkafka
41-
, mongoc
2+
# optional:
3+
, pkgconfig ? null # most of the extra deps need pkgconfig to be found
4+
, curl ? null
5+
, iptables ? null
6+
, jdk ? null
7+
, libatasmart ? null
8+
, libcredis ? null
9+
, libdbi ? null
10+
, libgcrypt ? null
11+
, libmemcached ? null, cyrus_sasl ? null
12+
, libmicrohttpd ? null
13+
, libmodbus ? null
14+
, libnotify ? null, gdk_pixbuf ? null
15+
, liboping ? null
16+
, libpcap ? null
17+
, libsigrok ? null
18+
, libvirt ? null
19+
, libxml2 ? null
20+
, libtool ? null
21+
, lm_sensors ? null
22+
, lvm2 ? null
23+
, mysql ? null
24+
, postgresql ? null
25+
, protobufc ? null
26+
, python ? null
27+
, rabbitmq-c ? null
28+
, riemann_c_client ? null
29+
, rrdtool ? null
30+
, udev ? null
31+
, varnish ? null
32+
, yajl ? null
33+
, net_snmp ? null
34+
, hiredis ? null
35+
, libmnl ? null
36+
, mosquitto ? null
37+
, rdkafka ? null
38+
, mongoc ? null
4239
}:
4340
stdenv.mkDerivation rec {
4441
version = "5.8.1";
@@ -49,14 +46,10 @@ stdenv.mkDerivation rec {
4946
sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
5047
};
5148

52-
patches = [
53-
(fetchpatch {
54-
url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
55-
sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
56-
})
57-
];
49+
# on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
50+
NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
5851

59-
nativeBuildInputs = [ pkgconfig autoreconfHook ];
52+
nativeBuildInputs = [ pkgconfig ];
6053
buildInputs = [
6154
curl libdbi libgcrypt libmemcached
6255
cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
@@ -67,16 +60,12 @@ stdenv.mkDerivation rec {
6760
] ++ stdenv.lib.optionals stdenv.isLinux [
6861
iptables libatasmart libcredis libmodbus libsigrok
6962
lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
70-
libapparmor numactl libcap_ng
7163
] ++ stdenv.lib.optionals stdenv.isDarwin [
7264
darwin.apple_sdk.frameworks.IOKit
7365
darwin.apple_sdk.frameworks.ApplicationServices
7466
];
7567

76-
configureFlags = [
77-
"--localstatedir=/var"
78-
"--disable-werror"
79-
];
68+
configureFlags = [ "--localstatedir=/var" ];
8069

8170
# do not create directories in /var during installPhase
8271
postConfigure = ''

0 commit comments

Comments
 (0)
Please sign in to comment.