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

Re-Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 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, mysql }:
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
stdenv.mkDerivation rec {
pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
MYSQL_DIR = mysql.connector-c;
MYSQL_DIR = libmysqlclient;
MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
cmakeFlags = [