diff options
| author | Robin Gloster <mail@glob.in> | 2017-12-25 15:21:31 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | b69befbfd54160bbe29f3204ad5e7855536feb77 (patch) | |
| tree | a818e7fa2703c468df775bd9e4dd396b0cce566c | |
| parent | 1ca8a7aff6b62181a9592fcd6cb6f008041c5f1d (diff) | |
| download | nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar.gz nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar.bz2 nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar.lz nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar.xz nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.tar.zst nixpkgs-b69befbfd54160bbe29f3204ad5e7855536feb77.zip | |
mariadb: replace to connector-c
| -rw-r--r-- | pkgs/development/libraries/libagar/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/tntdb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/kea/default.nix | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 1c9e8eca0d5..ee984a53b4c 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -20,15 +20,16 @@ stdenv.mkDerivation rec { "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" "--with-gl=${mesa}" - "--with-mysql=yes" + "--with-mysql=${mysql.connector-c}" "--with-manpages=yes" ]; outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; + buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.client mandoc + bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index d11a5c344c9..75a494cfbde 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; - buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; + buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 68fb72ff7d9..f33fe7a7105 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" + "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 mysql.client + openssl log4cplus boost python3 mysql.connector-c botan2 gmp bzip2 ]; |