public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "collectd: fix build with lm_sensors" (#52619)

Browse Source
This commit is contained in:
Timo Kaufmann 2018-12-21 13:11:22 +01:00 committed by GitHub
parent e0561cbadd
commit c5398741e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
pkgs/tools/system/collectd/default.nix
View File

@ -1,44 +1,41 @@
{ stdenv, fetchurl, fetchpatch, darwin { stdenv, fetchurl, fetchpatch, darwin
, autoreconfHook # optional:
, pkgconfig , pkgconfig ? null # most of the extra deps need pkgconfig to be found
, curl , curl ? null
, iptables , iptables ? null
, jdk , jdk ? null
, libapparmor , libatasmart ? null
, libatasmart , libcredis ? null
, libcap_ng , libdbi ? null
, libcredis , libgcrypt ? null
, libdbi , libmemcached ? null, cyrus_sasl ? null
, libgcrypt , libmicrohttpd ? null
, libmemcached, cyrus_sasl , libmodbus ? null
, libmicrohttpd , libnotify ? null, gdk_pixbuf ? null
, libmodbus , liboping ? null
, libnotify, gdk_pixbuf , libpcap ? null
, liboping , libsigrok ? null
, libpcap , libvirt ? null
, libsigrok , libxml2 ? null
, libvirt , libtool ? null
, libxml2 , lm_sensors ? null
, libtool , lvm2 ? null
, lm_sensors , mysql ? null
, lvm2 , postgresql ? null
, mysql , protobufc ? null
, numactl , python ? null
, postgresql , rabbitmq-c ? null
, protobufc , riemann_c_client ? null
, python , rrdtool ? null
, rabbitmq-c , udev ? null
, riemann_c_client , varnish ? null
, rrdtool , yajl ? null
, udev , net_snmp ? null
, varnish , hiredis ? null
, yajl , libmnl ? null
, net_snmp , mosquitto ? null
, hiredis , rdkafka ? null
, libmnl , mongoc ? null
, mosquitto
, rdkafka
, mongoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.8.1"; version = "5.8.1";
@ -49,14 +46,10 @@ stdenv.mkDerivation rec {
sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
}; };
patches = [ # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
(fetchpatch { NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
})
];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
curl libdbi libgcrypt libmemcached curl libdbi libgcrypt libmemcached
cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
@ -67,16 +60,12 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
iptables libatasmart libcredis libmodbus libsigrok iptables libatasmart libcredis libmodbus libsigrok
lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
libapparmor numactl libcap_ng
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.IOKit
darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.ApplicationServices
]; ];
configureFlags = [ configureFlags = [ "--localstatedir=/var" ];
"--localstatedir=/var"
"--disable-werror"
];
# do not create directories in /var during installPhase # do not create directories in /var during installPhase
postConfigure = '' postConfigure = ''