summary refs log tree commit diff
path: root/pkgs/development/lua-modules
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2020-02-27 11:01:30 +0100
committerGitHub <noreply@github.com>2020-02-27 11:01:30 +0100
commit7f821b3efc15072e91006416a1db6120555a5e24 (patch)
treee8027bd03d726c6a4f31f86d27d2dad0fbfbda26 /pkgs/development/lua-modules
parent39ed5ff74c17b8f494c41e2d556483b2bd08f852 (diff)
parent006aeb5704123f259d5cda435a991b3d72225b32 (diff)
downloadnixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar.gz
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar.bz2
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar.lz
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar.xz
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.tar.zst
nixpkgs-7f821b3efc15072e91006416a1db6120555a5e24.zip
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.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index fd99a70de3a..cb429e59c92 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