diff options
| author | Robin Gloster <mail@glob.in> | 2017-12-26 19:40:42 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | fe437d70ec14eecaf8b523021e70188ecf60ccb2 (patch) | |
| tree | 69d14b069f5b3f8d1dc6552661308bcea4274448 /pkgs/top-level/lua-packages.nix | |
| parent | f3445606ac2de2fa438b88000ff8e83167ee20a7 (diff) | |
| download | nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar.gz nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar.bz2 nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar.lz nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar.xz nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.tar.zst nixpkgs-fe437d70ec14eecaf8b523021e70188ecf60ccb2.zip | |
luaPackages.luadbi: libmysql -> connector-c
Diffstat (limited to 'pkgs/top-level/lua-packages.nix')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 7 |
1 files changed, 4 insertions, 3 deletions
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" ]; |