Skip to content

Commit

Permalink
buildLuarocksPackage: fixes attributes being ignored
Browse files Browse the repository at this point in the history
follow up of NixOS#224553 where
some arguments got ignored whil they were before taken into account.
  • Loading branch information
teto committed Apr 27, 2023
1 parent 9b6a320 commit ac0e0bd
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions pkgs/development/interpreters/lua-5/build-lua-package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
;
Expand Down Expand Up @@ -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

0 comments on commit ac0e0bd

Please sign in to comment.