From 46b75db767c72fc191ea4f8ecf360598f21a60dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Dec 2018 11:18:22 +0100 Subject: [PATCH] collectd: fix build with lm_sensors --- pkgs/tools/system/collectd/default.nix | 93 ++++++++++++++------------ 1 file changed, 52 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 8b99f1c7ca9..781a813c095 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,41 +1,44 @@ { stdenv, fetchurl, fetchpatch, darwin -# optional: -, pkgconfig ? null # most of the extra deps need pkgconfig to be found -, curl ? null -, iptables ? null -, jdk ? null -, libatasmart ? null -, libcredis ? null -, libdbi ? null -, libgcrypt ? null -, libmemcached ? null, cyrus_sasl ? null -, libmicrohttpd ? null -, libmodbus ? null -, libnotify ? null, gdk_pixbuf ? null -, liboping ? null -, libpcap ? null -, libsigrok ? null -, libvirt ? null -, libxml2 ? null -, libtool ? null -, lm_sensors ? null -, lvm2 ? null -, mysql ? null -, postgresql ? null -, protobufc ? null -, python ? null -, rabbitmq-c ? null -, riemann_c_client ? null -, rrdtool ? null -, udev ? null -, varnish ? null -, yajl ? null -, net_snmp ? null -, hiredis ? null -, libmnl ? null -, mosquitto ? null -, rdkafka ? null -, mongoc ? null +, autoreconfHook +, pkgconfig +, curl +, iptables +, jdk +, libapparmor +, libatasmart +, libcap_ng +, libcredis +, libdbi +, libgcrypt +, libmemcached, cyrus_sasl +, libmicrohttpd +, libmodbus +, libnotify, gdk_pixbuf +, liboping +, libpcap +, libsigrok +, libvirt +, libxml2 +, libtool +, lm_sensors +, lvm2 +, mysql +, numactl +, postgresql +, protobufc +, python +, rabbitmq-c +, riemann_c_client +, rrdtool +, udev +, varnish +, yajl +, net_snmp +, hiredis +, libmnl +, mosquitto +, rdkafka +, mongoc }: stdenv.mkDerivation rec { version = "5.8.1"; @@ -46,10 +49,14 @@ stdenv.mkDerivation rec { sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; }; - # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] - NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; + patches = [ + (fetchpatch { + url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch"; + sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15"; + }) + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt @@ -60,12 +67,16 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl + libapparmor numactl libcap_ng ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.ApplicationServices ]; - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--localstatedir=/var" + "--disable-werror" + ]; # do not create directories in /var during installPhase postConfigure = ''