diff options
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/plugins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/proxy.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/server.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 62f40b59d374a..9f23cc3e54c38 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps +, dnsutils, libdbi, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 53932af6a18f7..48b72dc0590d1 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -3,7 +3,7 @@ , snmpSupport ? true, net_snmp , sshSupport ? true, libssh2 , sqliteSupport ? false, sqlite -, mysqlSupport ? false, libmysqlclient +, mysqlSupport ? false, mysql , postgresqlSupport ? false, postgresql }: @@ -37,7 +37,7 @@ in ++ optional snmpSupport net_snmp ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 - ++ optional mysqlSupport libmysqlclient + ++ optional mysqlSupport mysql.connector-c ++ optional postgresqlSupport postgresql; configureFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index ac5dcca901d5c..51ca38e8cfc89 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -4,7 +4,7 @@ , odbcSupport ? true, unixODBC , snmpSupport ? true, net_snmp , sshSupport ? true, libssh2 -, mysqlSupport ? false, libmysqlclient +, mysqlSupport ? false, mysql , postgresqlSupport ? false, postgresql }: @@ -40,7 +40,7 @@ in ++ optional ldapSupport openldap ++ optional snmpSupport net_snmp ++ optional sshSupport libssh2 - ++ optional mysqlSupport libmysqlclient + ++ optional mysqlSupport mysql.connector-c ++ optional postgresqlSupport postgresql; configureFlags = [ |