gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luaPackages.wrapLua: Fix the wrapper on cross (#481464)

Browse Source
This commit is contained in:
Artturin
2026-01-25 21:21:13 +00:00
committed by GitHub
parent 6095dea7ef e1e2f27c78
commit 4054ea2cea
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+2 -2
View File
@@ -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
);
generatedConfig = luaLib.generateLuarocksConfig {
@@ -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)
);
};
pkgs/top-level/lua-packages.nix
+1 -3
View File
@@ -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 { });