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

6
pkgs/development/libraries/cppdb/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
stdenv.mkDerivation rec {
pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
cmakeFlags = [ "--no-warn-unused-cli" ];
NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
meta = with stdenv.lib; {
homepage = http://cppcms.com/sql/cppdb/;