buildLuaPackage: pass propagatedBuildInputs to final derivation (#108311)

propagatedBuildInputs was completely overridden in the process
This commit is contained in:
Luka Blašković 2021-01-03 14:03:30 +01:00 committed by GitHub
parent bfa497bc2b
commit beef4b95a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,11 +1,14 @@
{ lua, writeText, toLuaModule }: { lua, writeText, toLuaModule }:
{ disabled ? false, ... } @ attrs: { disabled ? false
, propagatedBuildInputs ? [ ]
, ...
} @ attrs:
if disabled then if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
else else
toLuaModule( lua.stdenv.mkDerivation ( toLuaModule (lua.stdenv.mkDerivation (
{ {
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
@ -18,8 +21,8 @@ else
// //
{ {
name = "lua${lua.luaversion}-" + attrs.name; name = "lua${lua.luaversion}-" + attrs.name;
propagatedBuildInputs = [ propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook lua # propagate it for its setup-hook
]; ];
} }
) ) ))