diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-17 21:24:29 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-09-09 15:55:34 +0300 |
| commit | 329a88efa78126ae7413807ce58000eab49e82d9 (patch) | |
| tree | 432995643b4784e5eefdd253ace54a2566eebd7c /pkgs/tools/system | |
| parent | cfb909229dd4c82441ddbf6d904def2057b62678 (diff) | |
| download | nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.gz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.bz2 nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.lz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.xz nixlib-329a88efa78126ae7413807ce58000eab49e82d9.tar.zst nixlib-329a88efa78126ae7413807ce58000eab49e82d9.zip | |
treewide: replace mysql.connector-c to libmysqlclient
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 1df73e08d1e3..3e7e4e5969ab 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -22,7 +22,7 @@ , libtool , lm_sensors , lvm2 -, mysql +, libmysqlclient , numactl , postgresql , protobufc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd riemann_c_client mosquitto rdkafka mongoc - ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c + ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 2899837f3f88..34b7b7d908a8 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc - ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (mysql != null) "mysql") + (mkFlag (libmysqlclient != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") |