Merge pull request #13475 from rimmington/collectd-no-mysql

collectd: allow mysql to be null

zimbatm 6a518e51 8726c6d5

Changed files
+3 -2
pkgs
tools
system
collectd
top-level
+2 -2
pkgs/tools/system/collectd/default.nix
···
, libtool ? null
, lm_sensors ? null
, lvm2 ? null
-
, mysql ? null
+
, libmysql ? null
, postgresql ? null
, protobufc ? null
, python ? null
···
buildInputs = [
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
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
];
+1
pkgs/top-level/all-packages.nix
···
collectd = callPackage ../tools/system/collectd {
rabbitmq-c = rabbitmq-c_0_4;
+
libmysql = mysql.lib;
};
colormake = callPackage ../development/tools/build-managers/colormake { };