diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/libraries/poco | |
parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
download | nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/libraries/poco')
-rw-r--r-- | pkgs/development/libraries/poco/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index c19e343f19a..e69ed0236f4 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -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 = [ |