dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

r2modman: 3.1.50 -> 3.1.54

Browse Source
This commit is contained in:
BennetLe 2024-11-23 22:08:56 +01:00
parent 0a92232f3f
commit 14571a9f96
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/r2/r2modman/package.nix
View File

@ -14,18 +14,18 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "r2modman"; pname = "r2modman";
version = "3.1.50"; version = "3.1.54";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ebkr"; owner = "ebkr";
repo = "r2modmanPlus"; repo = "r2modmanPlus";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-WmF7tH5PiaggyvP/klWwNgaLKVhIoApxDtwwLpug52A="; hash = "sha256-hsaFtQW/awhnBFS6xqDtRvzkzr/afzojYecgglsc3K8=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock"; yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-ntXZ4gRXRqiPQxdwXDsLxGdBqUV5eboy9ntTlJsz9FA="; hash = "sha256-VXlFB7hT+aL3yufJ/Ar7FMdrk2Iptf5rdvagAop00lk=";
}; };
patches = [ patches = [

8
pkgs/by-name/r2/r2modman/steam-launch-fix.patch
View File

@ -1,8 +1,6 @@
diff --git a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
index ddee0e9..fc9ffca 100644
--- a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts --- a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
+++ b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts +++ b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts
@@ -61,15 +61,9 @@ export default class SteamGameRunner_Linux extends GameRunnerProvider { @@ -64,15 +64,8 @@
async start(game: Game, args: string): Promise<void | R2Error> { async start(game: Game, args: string): Promise<void | R2Error> {
const settings = await ManagerSettings.getSingleton(game); const settings = await ManagerSettings.getSingleton(game);
@ -11,8 +9,8 @@ index ddee0e9..fc9ffca 100644
- return steamDir; - return steamDir;
- } - }
- -
- LoggerProvider.instance.Log(LogSeverity.INFO, `Steam directory is: ${steamDir}`); - LoggerProvider.instance.Log(LogSeverity.INFO, `Steam folder is: ${steamDir}`);
-
try { try {
- const cmd = `"${steamDir}/steam.sh" -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`; - const cmd = `"${steamDir}/steam.sh" -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`;
+ const cmd = `steam -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`; + const cmd = `steam -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`;