diff options
| author | Robin Gloster <mail@glob.in> | 2017-12-27 17:00:39 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | 572b2bda4e0a2245f465738cc919197ae0af06a4 (patch) | |
| tree | 25e272248d6d0c114354a946430499b789b7be31 /pkgs/servers | |
| parent | 6903ea60502865fe4397d8aaacc38ff674acaeb9 (diff) | |
| download | nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.gz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.bz2 nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.lz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.xz nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.tar.zst nixlib-572b2bda4e0a2245f465738cc919197ae0af06a4.zip | |
treewide: generalise for both mysql & mariadb
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dns/powerdns/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index d7556a39ee92..79fff80b0b8c 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, boost, libyamlcpp, libsodium, sqlite, protobuf, - libmysql, postgresql, lua, openldap, geoip, curl + mysql57, postgresql, lua, openldap, geoip, curl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; + buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0098353808fa..ae3fa40a8945 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -56,7 +56,9 @@ self = stdenv.mkDerivation rec { ''; passthru = { + client = self; connector-c = self; + server = self; mysqlVersion = "5.7"; }; |