diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index bc161f38f28..0934ef1028d 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-IHgoi5VUN3ORbufkruPb6wR7pTekJFQHhhDrnjOWzWM="; + hash = "sha256-SrBPqGRIsP0+ZWDe96sqjqCpJoY3Sn3VoPpMw7ellC0="; }; patches = [ @@ -26,10 +26,7 @@ buildPythonApplication rec { ./steam-run.patch ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ vdf ]; @@ -52,7 +49,7 @@ buildPythonApplication rec { meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ metadark ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 5e91de58dbe..76b7b7f6036 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index 9641970..6a2b268 100755 +index cc65a03..5c3fc7a 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py @@ -15,8 +15,8 @@ import sys @@ -10,10 +10,10 @@ index 9641970..6a2b268 100755 - find_steam_path, get_steam_apps, get_steam_lib_paths) +from .steam import (find_proton_app, find_steam_path, get_steam_apps, + get_steam_lib_paths) - from .util import run_command + from .util import run_command, is_flatpak_sandbox from .winetricks import get_winetricks_path -@@ -75,8 +75,7 @@ def main(args=None): +@@ -77,8 +77,7 @@ def main(args=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " @@ -23,7 +23,7 @@ index 9641970..6a2b268 100755 ), formatter_class=argparse.RawTextHelpFormatter ) -@@ -138,18 +137,9 @@ def main(args=None): +@@ -148,18 +147,9 @@ def main(args=None): ) sys.exit(-1) @@ -44,7 +44,7 @@ index 9641970..6a2b268 100755 else: use_steam_runtime = False logger.info("Steam Runtime disabled.") -@@ -212,7 +202,6 @@ def main(args=None): +@@ -222,7 +212,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -52,7 +52,7 @@ index 9641970..6a2b268 100755 command=[winetricks_path, "--gui"], use_bwrap=use_bwrap ) -@@ -282,7 +271,6 @@ def main(args=None): +@@ -292,7 +281,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -60,7 +60,7 @@ index 9641970..6a2b268 100755 use_bwrap=use_bwrap, command=[winetricks_path] + args.winetricks_command) elif args.command: -@@ -292,7 +280,6 @@ def main(args=None): +@@ -302,7 +290,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -69,21 +69,21 @@ index 9641970..6a2b268 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 8554e24..509afb6 100644 +index f9fb9ec..e1e588a 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py -@@ -13,8 +13,8 @@ from .util import lower_dict +@@ -12,8 +12,8 @@ from .util import lower_dict + __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", - "find_steam_proton_app", "find_proton_app", -- "find_legacy_steam_runtime_path", "find_appid_proton_prefix", -- "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" -+ "find_appid_proton_prefix", "get_steam_lib_paths", -+ "get_steam_apps", "get_custom_proton_installations" - ) - - COMMON_STEAM_DIRS = [ -@@ -283,37 +283,6 @@ def find_steam_path(): +- "find_legacy_steam_runtime_path", "get_appinfo_sections", +- "get_proton_appid", "find_steam_proton_app", "find_appid_proton_prefix", ++ "get_appinfo_sections", "get_proton_appid", ++ "find_steam_proton_app", "find_appid_proton_prefix", + "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", + "get_proton_installations", "get_custom_proton_installations", + "find_current_steamid3", "get_appid_from_shortcut", +@@ -286,37 +286,6 @@ def find_steam_path(): return None, None @@ -122,10 +122,31 @@ index 8554e24..509afb6 100644 APPINFO_STRUCT_SECTION = "