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

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

Browse Source 
collectd: allow mysql to be null
This commit is contained in:
zimbatm 2016-02-27 22:24:57 +00:00
commit 6a518e51dd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/system/collectd/default.nix
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
]; ];

1
pkgs/top-level/all-packages.nix
View File

@ -1138,6 +1138,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 { };