collectd: allow mysql to be null

This commit is contained in:
Rhys 2016-02-26 13:44:41 +11:00
parent 885acea1dd
commit ac94a5d86c
2 changed files with 3 additions and 2 deletions

View file

@ -19,7 +19,7 @@
, libtool ? null , libtool ? null
, lm_sensors ? null , lm_sensors ? null
, lvm2 ? null , lvm2 ? null
, mysql ? null , libmysql ? null
, postgresql ? null , postgresql ? null
, protobufc ? null , protobufc ? null
, python ? null , python ? null
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
varnish yajl jdk libtool python udev varnish yajl jdk libtool python udev
]; ];

View file

@ -1130,6 +1130,7 @@ let
collectd = callPackage ../tools/system/collectd { collectd = callPackage ../tools/system/collectd {
rabbitmq-c = rabbitmq-c_0_4; rabbitmq-c = rabbitmq-c_0_4;
libmysql = mysql.lib;
}; };
colormake = callPackage ../development/tools/build-managers/colormake { }; colormake = callPackage ../development/tools/build-managers/colormake { };