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

treewide: fix up some mysql.connector-c fallout

Browse Source
This commit is contained in:
Robin Gloster 2017-07-26 17:53:42 +02:00
parent 9359050ae2
commit d9d98cd324
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ];
cmakeFlags = [
"-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql"
"-DMYSQL_INCLUDE_DIR=${libmysql}/include/mysql"
"-DPOCO_UNBUNDLED=ON"
];

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

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${libmysql.dev}"
"-DMYSQL_PREFIX=${libmysql}"
"--no-warn-unused-cli"
];

2
pkgs/tools/backup/bareos/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
++ optional (libmysql != null) "--with-mysql=${libmysql.dev}"
++ optional (libmysql != null) "--with-mysql=${libmysql}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}"