alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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 { stdenv, fetchurl, libdbi
, mysql ? null, sqlite ? null, postgresql ? null , libmysql ? null, sqlite ? null, postgresql ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
}; };
buildInputs = [ libdbi sqlite postgresql ] buildInputs = [ libdbi libmysql sqlite postgresql ];
++ optional (mysql != null) mysql.lib;
postPatch = '' postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
"--enable-libdbi" "--enable-libdbi"
"--with-dbi-incdir=${libdbi}/include" "--with-dbi-incdir=${libdbi}/include"
"--with-dbi-libdir=${libdbi}/lib" "--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (mysql != null) [ ] ++ optionals (libmysql != null) [
"--with-mysql" "--with-mysql"
"--with-mysql-incdir=${mysql.lib}/include/mysql" "--with-mysql-incdir=${libmysql}/include/mysql"
"--with-mysql-libdir=${mysql.lib}/lib/mysql" "--with-mysql-libdir=${libmysql}/lib/mysql"
] ++ optionals (postgresql != null) [ ] ++ optionals (postgresql != null) [
"--with-pgsql" "--with-pgsql"
"--with-pgsql_incdir=${postgresql}/include" "--with-pgsql_incdir=${postgresql}/include"

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

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