buildLuaPackage: make makeFlags expandable

1 files changed, 8 insertions, 9 deletions

diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 183a958b4e1f1..7f07c6602dacd 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -2,6 +2,7 @@
 
 { disabled ? false
 , propagatedBuildInputs ? [ ]
+, makeFlags ? [ ]
 , ...
 } @ attrs:
 
@@ -9,18 +10,16 @@ if disabled then
   throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
 else
   toLuaModule (lua.stdenv.mkDerivation (
-    {
+    attrs // {
+      name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
+
       makeFlags = [
         "PREFIX=$(out)"
-        "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
         "LUA_INC=-I${lua}/include"
-      ];
-    }
-    //
-    attrs
-    //
-    {
-      name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
+        "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
+        "LUA_VERSION=${lua.luaversion}"
+      ] ++ makeFlags;
+
       propagatedBuildInputs = propagatedBuildInputs ++ [
         lua # propagate it for its setup-hook
       ];