diff options
| author | Luka Blašković <lblasc@users.noreply.github.com> | 2021-01-03 14:03:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 14:03:30 +0100 |
| commit | beef4b95a9664b713e9107641a006cf627ae4c26 (patch) | |
| tree | 1a7fe179f4c6bd2c41b4571150034ba6b72da05d /pkgs/development/lua-modules | |
| parent | bfa497bc2b858148d344126ec68a2e217f338123 (diff) | |
buildLuaPackage: pass propagatedBuildInputs to final derivation (#108311)
propagatedBuildInputs was completely overridden in the process
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/generic/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 71e1f7c05e6e..de21d3d6a3e6 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,11 +1,14 @@ { lua, writeText, toLuaModule }: -{ disabled ? false, ... } @ attrs: +{ disabled ? false +, propagatedBuildInputs ? [ ] +, ... +} @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - toLuaModule( lua.stdenv.mkDerivation ( + toLuaModule (lua.stdenv.mkDerivation ( { makeFlags = [ "PREFIX=$(out)" @@ -18,8 +21,8 @@ else // { name = "lua${lua.luaversion}-" + attrs.name; - propagatedBuildInputs = [ + propagatedBuildInputs = propagatedBuildInputs ++ [ lua # propagate it for its setup-hook ]; } - ) ) + )) |