diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 736c9463521ff..2c7450aa40d27 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -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) ); }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bc5b3bb649ae7..e2a42938108b3 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -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 { });