public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mariadb: replace to connector-c

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libagar/default.nix
View File

@ -20,15 +20,16 @@ stdenv.mkDerivation rec {
"--with-gettext=${gettext}" "--with-gettext=${gettext}"
"--with-jpeg=${libjpeg.dev}" "--with-jpeg=${libjpeg.dev}"
"--with-gl=${mesa}" "--with-gl=${mesa}"
"--with-mysql=yes" "--with-mysql=${mysql.connector-c}"
"--with-manpages=yes" "--with-manpages=yes"
]; ];
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig libtool gettext ]; nativeBuildInputs = [ pkgconfig libtool gettext ];
buildInputs = [ 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 freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
]; ];

2
pkgs/development/libraries/tntdb/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
}; };
buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/tools/networking/kea/default.nix
View File

@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--with-dhcp-pgsql=${postgresql}/bin/pg_config" "--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 ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ buildInputs = [
openssl log4cplus boost python3 mysql.client openssl log4cplus boost python3 mysql.connector-c
botan2 gmp bzip2 botan2 gmp bzip2
]; ];