diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index f665b4bef0a8..5abe5d613f8e 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.2.16"; + version = "3.2.17"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; tag = "v${finalAttrs.version}"; - hash = "sha256-ya7VPb+bmOvtXNex9R80N6rZLSCVoyntqCzaHXIwb1M="; + hash = "sha256-DXGgTezCcMl37Vu7R+2dwWJmuqsXXtlWRYMX9gqm7+w="; }; missingHashes = ./missing-hashes.json; @@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: { # Remove after upstream updates to Yarn 4.14 # https://github.com/ebkr/r2modmanPlus/blob/develop/package.json#L118 ./yarn-4.14-support.patch + + # Fix copying of wrapper files to game directory + ./wrapper-fix.patch ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/r2/r2modman/wrapper-fix.patch b/pkgs/by-name/r2/r2modman/wrapper-fix.patch new file mode 100644 index 000000000000..bf2681f673c4 --- /dev/null +++ b/pkgs/by-name/r2/r2modman/wrapper-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue +index a3d16f16..36d77fb1 100644 +--- a/src/pages/Splash.vue ++++ b/src/pages/Splash.vue +@@ -188,8 +188,8 @@ async function ensureWrapperInGameFolder(wrapperName: WrapperScript) { + if (await FsProvider.instance.exists(path.join(PathResolver.MOD_ROOT, wrapperName))) { + await FsProvider.instance.unlink(path.join(PathResolver.MOD_ROOT, wrapperName)); + } +- const wrapperFileResult = await fetch(ProtocolProvider.getPublicAssetUrl(`/${wrapperName}`)).then(res => res.arrayBuffer()); +- const wrapperFileContent = Buffer.from(wrapperFileResult); ++ const wrapperFilePath = path.join(staticsDirectory, wrapperName); ++ const wrapperFileContent = await FsProvider.instance.readFile(wrapperFilePath); + await FsProvider.instance.writeFile(path.join(PathResolver.MOD_ROOT, wrapperName), wrapperFileContent); + await FsProvider.instance.writeFile(path.join(PathResolver.MOD_ROOT, wrapperName), wrapperFileContent); + }