buildLuarocksPackage: fixes attributes being ignored

follow up of https://github.com/NixOS/nixpkgs/pull/224553 where
some arguments got ignored whil they were before taken into account.
This commit is contained in:
Matthieu Coudron 2023-04-24 23:07:03 +02:00 committed by Matthieu Coudron
parent 3d40934541
commit 26dd4a84ed

View File

@ -83,11 +83,10 @@ let
__structuredAttrs = true;
env = {
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
};
} // attrs.env or {};
generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
nativeBuildInputs = [
wrapLua
lua.pkgs.luarocks
@ -99,6 +98,7 @@ let
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
in [ lua.pkgs.luarocks ]
++ buildInputs
++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
++ (map (d: d.dep) externalDeps')
;
@ -200,15 +200,15 @@ let
'';
passthru = {
inherit lua; # The lua interpreter
};
inherit lua;
} // attrs.passthru or { };
meta = {
platforms = lua.meta.platforms;
# add extra maintainer(s) to every package
maintainers = (attrs.meta.maintainers or []) ++ [ ];
broken = disabled;
} // attrs.meta;
} // attrs.meta or {};
}));
in
luarocksDrv