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

libdbiDrivers: libmysql -> connector-c

Browse Source
This commit is contained in:
Robin Gloster 2017-12-25 18:08:09 +01:00
parent 62a3561b5e
commit f3445606ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libdbi { stdenv, fetchurl, libdbi
, libmysql ? null, sqlite ? null, postgresql ? null , mysql ? null, sqlite ? null, postgresql ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
}; };
buildInputs = [ libdbi libmysql sqlite postgresql ]; buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
postPatch = '' postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@ -24,7 +24,7 @@ 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 (libmysql != null) [ ] ++ optionals (mysql != null) [
"--with-mysql" "--with-mysql"
] ++ optionals (postgresql != null) [ ] ++ optionals (postgresql != null) [
"--with-pgsql" "--with-pgsql"

4
pkgs/top-level/all-packages.nix
View File

@ -9178,12 +9178,12 @@ with pkgs;
libdbi = callPackage ../development/libraries/libdbi { }; libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
libmysql = null; mysql = null;
sqlite = null; sqlite = null;
}; };
libdbiDrivers = libdbiDriversBase.override { libdbiDrivers = libdbiDriversBase.override {
inherit sqlite libmysql; inherit sqlite mysql;
}; };
libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };