rimsort: 1.0.47 -> 1.0.73 (#496387)

This commit is contained in:
Peder Bergebakken Sundt
2026-04-10 21:21:22 +00:00
committed by GitHub
2 changed files with 19 additions and 15 deletions
+7 -3
View File
@@ -16,13 +16,13 @@
}:
let
pname = "rimsort";
version = "1.0.47";
version = "1.0.73";
src = fetchFromGitHub {
owner = "RimSort";
repo = "RimSort";
rev = "v${version}";
hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";
hash = "sha256-xNmJ1XvnLTKhicVchzG9CQtRVoZjRkBEvfn/WWesDRU=";
fetchSubmodules = true;
};
@@ -111,10 +111,14 @@ stdenv.mkDerivation {
dontBuild = true;
nativeCheckInputs = with python3Packages; [
aiohttp
pytest-asyncio
pytestCheckHook
pytest-cov-stub
pytest-mock
pytest-qt
pytest-xvfb
rapidfuzz
];
doCheck = true;
@@ -126,7 +130,7 @@ stdenv.mkDerivation {
'';
disabledTestPaths = [
# requires network
# requires network (clones GitHub: Community-Rules-Database, Steam-Workshop-Database)
"tests/models/metadata/test_metadata_factory.py"
];
+12 -12
View File
@@ -2,17 +2,17 @@ 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
@@ -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)
)
@@ -299,7 +299,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
logger.info(
f"Launching the game with subprocess.Popen(): `{executable_path}` "
f"with env_vars: {list(env_vars.keys())}, wrappers: {wrapper_commands}, args: {game_args}"
)
+ if sys.platform == "linux":
+ game_args = [executable_path] + game_args
+ executable_path = "@steam-run@/bin/steam-run"
pid, popen_args = launch_process(
executable_path,
game_args,
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
@@ -24,7 +24,7 @@ index 398e0fd..79bb162 100644
- self.steamcmd,
- [f'+runscript "{script_path}"'],
+ "@steam-run@/bin/steam-run",
+ [self.steamcmd, f'+runscript "{script_path}"'],
+ [self.steamcmd, f'+runscript "{script_path}"'],
len(publishedfileids),
)
else: