Unverified Commit cfbf408d authored by Colin's avatar Colin Committed by GitHub
Browse files

rimsort: 1.0.30 -> 1.0.47, fix desktop item (#447727)

parents ad3e391d da238bcf

pkgs/by-name/ri/rimsort/package.nix

+8 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  makeBinaryWrapper,



  makeDesktopItem,

  copyDesktopItems,

  replaceVars,



  todds,
@@ -15,15 +16,16 @@ 
}:

let

  pname = "rimsort";

  version = "1.0.30";

  version = "1.0.47";



  src = fetchFromGitHub {

    owner = "RimSort";

    repo = "RimSort";

    rev = "v${version}";

    hash = "sha256-f1wYoBC0EbkvYNJHkVuoMukJZMY7eNjCIzJra7/hpLs=";

    hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";

    fetchSubmodules = true;

  };



  steamworksSrc = fetchzip {

    url = "https://web.archive.org/web/20250527013243/https://partner.steamgames.com/downloads/steamworks_sdk_162.zip"; # Steam sometimes requires auth to download.

    hash = "sha256-yDA92nGj3AKTNI4vnoLaa+7mDqupQv0E4YKRRUWqyZw=";
@@ -70,6 +72,7 @@ stdenv.mkDerivation { 


  nativeBuildInputs = [

    makeBinaryWrapper

    copyDesktopItems

  ];



  buildInputs = [
@@ -100,6 +103,7 @@ stdenv.mkDerivation { 
      toposort

      watchdog

      xmltodict

      zstandard

      steamworkspy

      ;

  };
@@ -133,7 +137,7 @@ stdenv.mkDerivation { 
      name = "RimSort";

      desktopName = "RimSort";

      exec = "rimsort";

      icon = "io.github.rimsort.rimsort";

      icon = "rimsort";

      comment = "RimWorld Mod Manager";

      categories = [ "Game" ];

    })
@@ -155,7 +159,7 @@ stdenv.mkDerivation { 
      --prefix PYTHONPATH : "$PYTHONPATH" \

      --set RIMSORT_DISABLE_UPDATER 1



    install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/io.github.rimsort.rimsort

    install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/rimsort.png



    runHook postInstall

  '';

pkgs/by-name/ri/rimsort/steam-run.patch

+14 −10
Original line number Diff line number Diff line 
diff --git a/app/utils/generic.py b/app/utils/generic.py

index f23aa5c..9ff4a04 100644

--- a/app/utils/generic.py

+++ b/app/utils/generic.py

@@ -255,7 +255,7 @@

                 popen_args.extend(args)

                 p = subprocess.Popen(popen_args)

             else:

-                popen_args = [executable_path]

+                popen_args = ["@steam-run@/bin/steam-run", executable_path]

                 popen_args.extend(args)

 

                 if sys.platform == "win32":

@@ -260,6 +260,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:

                 + str(args)

                 + "`"

             )

+

+            args = [executable_path, *args]

+            executable_path = "@steam-run@/bin/steam-run"

+

             pid, popen_args = launch_process(

                 executable_path, args, str(game_install_path)

             )

diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py

index 398e0fd..79bb162 100644

--- a/app/utils/steam/steamcmd/wrapper.py

+++ b/app/utils/steam/steamcmd/wrapper.py

@@ -316,8 +316,8 @@

@@ -317,8 +317,8 @@ class SteamcmdInterface:

                 script_output.write("\n".join(script))

             runner.message(f"Compiled & using script: {script_path}")

             runner.execute(