mariadb: replace to connector-c

This commit is contained in:
Robin Gloster 2017-12-25 15:21:31 +01:00
parent 1ca8a7aff6
commit b69befbfd5
3 changed files with 6 additions and 5 deletions

View File

@ -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
];

View File

@ -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;

View File

@ -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
];