From fe437d70ec14eecaf8b523021e70188ecf60ccb2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Dec 2017 19:40:42 +0100 Subject: luaPackages.luadbi: libmysql -> connector-c --- pkgs/top-level/lua-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/top-level/lua-packages.nix') diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c83e62fd89a..4c05f96caf7 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook -, libmysql, postgresql, cyrus_sasl +, mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which }: @@ -210,7 +210,7 @@ let }; sourceRoot = "."; - buildInputs = [ libmysql postgresql sqlite ]; + buildInputs = [ mysql.connector-c postgresql sqlite ]; preConfigure = '' substituteInPlace Makefile --replace CC=gcc CC=cc @@ -220,7 +220,8 @@ let ''; NIX_CFLAGS_COMPILE = [ - "-I${libmysql.dev}/include/mysql" + "-I${mysql.connector-c}/include/mysql" + "-L${mysql.connector-c}/lib/mysql" "-I${postgresql}/include/server" ]; -- cgit 1.4.1