diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/libraries/libdbi-drivers | |
parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/libraries/libdbi-drivers')
-rw-r--r-- | pkgs/development/libraries/libdbi-drivers/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 52b8a32fab4a5..99cd636b03b8e 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libdbi -, libmysqlclient ? null +, mysql ? null , sqlite ? null , postgresql ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient; + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { "--enable-libdbi" "--with-dbi-incdir=${libdbi}/include" "--with-dbi-libdir=${libdbi}/lib" - ] ++ optionals (libmysqlclient != null) [ + ] ++ optionals (mysql != null) [ "--with-mysql" - "--with-mysql-incdir=${libmysqlclient}/include/mysql" - "--with-mysql-libdir=${libmysqlclient}/lib/mysql" + "--with-mysql-incdir=${mysql.connector-c}/include/mysql" + "--with-mysql-libdir=${mysql.connector-c}/lib/mysql" ] ++ optionals (sqlite != null) [ "--with-sqlite3" "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" |