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
pkgs/development/libraries/opendbx/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
stdenv.mkDerivation rec {
name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
export CPPFLAGS="-I${libmysqlclient}/include/mysql"
export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
'';
buildInputs = [ readline libmysqlclient postgresql sqlite ];
buildInputs = [ readline mysql.connector-c postgresql sqlite ];
meta = with stdenv.lib; {
description = "Extremely lightweight but extensible database access library written in C";