diff options
author | Matthieu Coudron <mattator@gmail.com> | 2020-02-27 11:01:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 11:01:30 +0100 |
commit | 7f821b3efc15072e91006416a1db6120555a5e24 (patch) | |
tree | e8027bd03d726c6a4f31f86d27d2dad0fbfbda26 /pkgs/development/lua-modules | |
parent | 39ed5ff74c17b8f494c41e2d556483b2bd08f852 (diff) | |
parent | 006aeb5704123f259d5cda435a991b3d72225b32 (diff) |
Merge pull request #81067 from teto/lua_fix
- introduce a default checkPhase for lua (disabled by default)
- dont apply patchShebangs on the whole lua package; hopefulyl it doesnt break stuff
Diffstat (limited to 'pkgs/development/lua-modules')
-rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index fd99a70de3a6..cb429e59c927 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -153,11 +153,11 @@ with super; }); luadbi-mysql = super.luadbi-mysql.override({ - extraVariables = '' - -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql'; - MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql'; - ''; + extraVariables = { + # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' + MYSQL_INCDIR="${pkgs.libmysqlclient}/include/mysql"; + MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; + }; buildInputs = [ pkgs.mysql.client pkgs.libmysqlclient |