Unverified Commit 4054ea2c authored by Artturin's avatar Artturin Committed by GitHub
Browse files

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

parents 6095dea7 e1e2f27c

pkgs/development/interpreters/lua-5/build-luarocks-package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 { });