tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
protontricks: 1.6.0 → 1.6.1
Kira Bruneau
4 years ago
f4100c90
759bd01a
+9
-9
2 changed files
expand all
collapse all
unified
split
pkgs
tools
package-management
protontricks
default.nix
steam-run.patch
+2
-2
pkgs/tools/package-management/protontricks/default.nix
···
13
14
buildPythonApplication rec {
15
pname = "protontricks";
16
-
version = "1.6.0";
17
18
src = fetchFromGitHub {
19
owner = "Matoking";
20
repo = pname;
21
rev = version;
22
-
hash = "sha256-sbYIqVsuDZ2Htb6SVIe/gBA1UIvUzu4fjTjWQ7k1WFs=";
23
};
24
25
patches = [
···
13
14
buildPythonApplication rec {
15
pname = "protontricks";
16
+
version = "1.6.1";
17
18
src = fetchFromGitHub {
19
owner = "Matoking";
20
repo = pname;
21
rev = version;
22
+
sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY=";
23
};
24
25
patches = [
+7
-7
pkgs/tools/package-management/protontricks/steam-run.patch
···
1
diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py
2
-
index 535ec9b..690c1f9 100755
3
--- a/src/protontricks/cli/main.py
4
+++ b/src/protontricks/cli/main.py
5
@@ -14,8 +14,8 @@ import sys
···
48
steam_app=steam_app,
49
use_steam_runtime=use_steam_runtime,
50
- legacy_steam_runtime_path=legacy_steam_runtime_path,
51
-
command=[winetricks_path, "--gui"],
52
use_bwrap=use_bwrap
53
)
54
@@ -286,7 +276,6 @@ def main(args=None):
···
57
use_steam_runtime=use_steam_runtime,
58
- legacy_steam_runtime_path=legacy_steam_runtime_path,
59
use_bwrap=use_bwrap,
60
-
command=[winetricks_path] + args.winetricks_command)
61
elif args.command:
62
@@ -296,7 +285,6 @@ def main(args=None):
63
steam_app=steam_app,
···
68
# Pass the command directly into the shell *without*
69
# escaping it
70
diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py
71
-
index e898caf..7448d11 100644
72
--- a/src/protontricks/steam.py
73
+++ b/src/protontricks/steam.py
74
-
@@ -12,8 +12,8 @@ from .util import lower_dict
75
76
__all__ = (
77
"COMMON_STEAM_DIRS", "SteamApp", "find_steam_path",
···
82
"find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs",
83
"get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations",
84
"find_current_steamid3", "get_appid_from_shortcut",
85
-
@@ -311,37 +311,6 @@ def find_steam_path():
86
return None, None
87
88
···
275
os.environ["PATH"] = "".join([
276
str(wine_bin_dir), os.pathsep, os.environ["PATH"]
277
diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py
278
-
index e6da0fb..46b9545 100644
279
--- a/tests/cli/test_main.py
280
+++ b/tests/cli/test_main.py
281
@@ -116,15 +116,10 @@ class TestCLIRun:
···
1
diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py
2
+
index d811cb7..a376a34 100755
3
--- a/src/protontricks/cli/main.py
4
+++ b/src/protontricks/cli/main.py
5
@@ -14,8 +14,8 @@ import sys
···
48
steam_app=steam_app,
49
use_steam_runtime=use_steam_runtime,
50
- legacy_steam_runtime_path=legacy_steam_runtime_path,
51
+
command=[str(winetricks_path), "--gui"],
52
use_bwrap=use_bwrap
53
)
54
@@ -286,7 +276,6 @@ def main(args=None):
···
57
use_steam_runtime=use_steam_runtime,
58
- legacy_steam_runtime_path=legacy_steam_runtime_path,
59
use_bwrap=use_bwrap,
60
+
command=[str(winetricks_path)] + args.winetricks_command)
61
elif args.command:
62
@@ -296,7 +285,6 @@ def main(args=None):
63
steam_app=steam_app,
···
68
# Pass the command directly into the shell *without*
69
# escaping it
70
diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py
71
+
index be5322b..552f894 100644
72
--- a/src/protontricks/steam.py
73
+++ b/src/protontricks/steam.py
74
+
@@ -12,8 +12,8 @@ from .util import lower_dict, is_flatpak_sandbox
75
76
__all__ = (
77
"COMMON_STEAM_DIRS", "SteamApp", "find_steam_path",
···
82
"find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs",
83
"get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations",
84
"find_current_steamid3", "get_appid_from_shortcut",
85
+
@@ -318,37 +318,6 @@ def find_steam_path():
86
return None, None
87
88
···
275
os.environ["PATH"] = "".join([
276
str(wine_bin_dir), os.pathsep, os.environ["PATH"]
277
diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py
278
+
index f714f2c..b03fac1 100644
279
--- a/tests/cli/test_main.py
280
+++ b/tests/cli/test_main.py
281
@@ -116,15 +116,10 @@ class TestCLIRun: