diff options
author | Rhys <rimmington@gmail.com> | 2016-02-26 13:44:41 +1100 |
---|---|---|
committer | Rhys <rimmington@gmail.com> | 2016-02-27 12:02:44 +1100 |
commit | ac94a5d86c81d17669875564f3c3e957fbfe5313 (patch) | |
tree | 837b08506930f2b312086777effc7b029d348299 /pkgs | |
parent | 885acea1dd82b0354ff2b6bcf1268b3031cf93df (diff) | |
download | nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar.gz nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar.bz2 nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar.lz nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar.xz nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.tar.zst nixpkgs-ac94a5d86c81d17669875564f3c3e957fbfe5313.zip |
collectd: allow mysql to be null
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index ff64b54b985..a1d676d708d 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -19,7 +19,7 @@ , libtool ? null , lm_sensors ? null , lvm2 ? null -, mysql ? null +, libmysql ? null , postgresql ? null , protobufc ? null , python ? null @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..d91fa816f62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1130,6 +1130,7 @@ let collectd = callPackage ../tools/system/collectd { rabbitmq-c = rabbitmq-c_0_4; + libmysql = mysql.lib; }; colormake = callPackage ../development/tools/build-managers/colormake { }; |