Unverified Commit 3710b38c authored by Pierre Bourdon's avatar Pierre Bourdon Committed by GitHub
Browse files

Merge pull request #254668 from aidalgol/r2modman-fix 

r2modman: fixes
parents 8f711593 363e9382

pkgs/games/r2modman/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec { 
    hash = "sha256-CXitb/b2tvTfrkFrFv4KP4WdmMg+1sDtC/s2u5ezDfI=";

  };



  patches = [

    # Make it possible to launch Steam games from r2modman.

    ./steam-launch-fix.patch

  ];



  nativeBuildInputs = [

    yarn

    fixup_yarn_lock

pkgs/games/r2modman/steam-launch-fix.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
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

+++ b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts

@@ -61,15 +61,9 @@ export default class SteamGameRunner_Linux extends GameRunnerProvider {

     async start(game: Game, args: string): Promise<void | R2Error> {

 

         const settings = await ManagerSettings.getSingleton(game);

-        const steamDir = await GameDirectoryResolverProvider.instance.getSteamDirectory();

-        if(steamDir instanceof R2Error) {

-            return steamDir;

-        }

-

-        LoggerProvider.instance.Log(LogSeverity.INFO, `Steam directory is: ${steamDir}`);

 

         try {

-            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}`;

             LoggerProvider.instance.Log(LogSeverity.INFO, `Running command: ${cmd}`);

             await exec(cmd);

         } catch(err) {

pkgs/top-level/all-packages.nix

+4 −1
Original line number Diff line number Diff line
@@ -38442,7 +38442,10 @@ with pkgs; 














  r2mod_cli = callPackage ../games/r2mod_cli { };



























  r2modman = callPackage ../games/r2modman { };













  r2modman = callPackage ../games/r2modman {













    # Electron 26 has regressions making applications unusable.













    electron = electron_25;













  };





























  racer = callPackage ../games/racer { };