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

treewide: Make explicit that 'dev' output of libmysql is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 03:34:12 +03:00
parent 6d68178693
commit 1c761150f7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11" "-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}" "-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${libmysql}" "-DMYSQL_PREFIX=${libmysql.dev}"
"--no-warn-unused-cli" "--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 (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}" ++ optional (jansson != null) "--with-jansson=${jansson}"