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/poco/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
stdenv.mkDerivation rec {
pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
MYSQL_DIR = libmysqlclient;
MYSQL_DIR = mysql.connector-c;
MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
cmakeFlags = [