diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-26 17:53:42 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | d9d98cd324a23b4b2bf35a18527732ae50abe527 (patch) | |
| tree | ecb33bba4c36af840eb9a7f2d20bba09c1e83236 | |
| parent | 9359050ae2e80d93d98688d1315c36cf7be3ab9d (diff) | |
| download | nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar.gz nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar.bz2 nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar.lz nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar.xz nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.tar.zst nixpkgs-d9d98cd324a23b4b2bf35a18527732ae50abe527.zip | |
treewide: fix up some mysql.connector-c fallout
| -rw-r--r-- | pkgs/development/libraries/poco/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 0f971cff64d..0788e3bc404 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -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" ]; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 3adf4f1497f..573b02d7c58 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -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" ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c3256713832..7fa28c5f79b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -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}" |