Skip to content

luaPackages.wrapLua: Fix the wrapper on cross #481464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artturin merged 2 commits into from
Jan 25, 2026
Merged

luaPackages.wrapLua: Fix the wrapper on cross #481464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b596934
luaPackages.wrapLua: Fix the wrapper on cross
Artturin Jan 18, 2026
e1e2f27
luaPackages.buildLuarocksPackage: Get the final derivation picked by
Artturin Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/lua-5/build-luarocks-package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ let
luarocksConfig =
let
externalDepsGenerated = lib.filter (drv: !drv ? luaModule) (
self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
Copy link
Member Author

@Artturin Artturin Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't made with cross in mind so dunno if the buildHost should be picked or the hostTarget
If the hostTarget should be picked then the list has to be mapped and x.__spliced.hostTarget picked

Copy link
Member Author

@Artturin Artturin Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was added here 011911b

Copy link
Contributor

@doronbehar doronbehar Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't made with cross in mind so dunno if the buildHost should be picked or the hostTarget If the hostTarget should be picked then the list has to be mapped and x.__spliced.hostTarget picked

I think this works fine. The correct Bash is used in the wrappers of:

nix build -Lf. pkgsCross.armv7l-hf-multiplatform.lua54Packages.cjson

However still the 2 other commits available in #481511 are needed.

);

generatedConfig = luaLib.generateLuarocksConfig {
Expand All @@ -157,7 +157,7 @@ let
# closure, as it doesn't have a rock tree :)
# luaLib.hasLuaModule
requiredLuaRocks = lib.filter luaLib.hasLuaModule (
lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs)
lua.pkgs.requiredLuaModules (self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs)
);
};

Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/lua-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ rec {
;

# wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
};
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { };

luarocks_bootstrap = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { });

Expand Down
Loading