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

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libdbi-drivers/default.nix
View File

@@ -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"