swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdbi-drivers: Use libmysql

Browse source
This commit is contained in:
William A. Kennington III 2015-04-22 16:06:33 -07:00
parent 618c051985
commit 5129c67fd3
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/libdbi-drivers/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libdbi
, mysql ? null, sqlite ? null, postgresql ? null
, libmysql ? null, sqlite ? null, postgresql ? null
}:
with stdenv.lib;
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
};
buildInputs = [ libdbi sqlite postgresql ]
++ optional (mysql != null) mysql.lib;
buildInputs = [ libdbi libmysql sqlite postgresql ];
postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
"--enable-libdbi"
"--with-dbi-incdir=${libdbi}/include"
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (mysql != null) [
] ++ optionals (libmysql != null) [
"--with-mysql"
"--with-mysql-incdir=${mysql.lib}/include/mysql"
"--with-mysql-libdir=${mysql.lib}/lib/mysql"
"--with-mysql-incdir=${libmysql}/include/mysql"
"--with-mysql-libdir=${libmysql}/lib/mysql"
] ++ optionals (postgresql != null) [
"--with-pgsql"
"--with-pgsql_incdir=${postgresql}/include"

2
pkgs/top-level/all-packages.nix
View file

@ -6342,7 +6342,7 @@ let
libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
mysql = null;
libmysql = null;
sqlite = null;
};