diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index e74f735538e5..e528cab1b559 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mock, pytestCheckHook, }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU="; }; + patches = [ + # Support appinfo.vdf v29 (required by protontricks 1.12.0) + (fetchpatch2 { + url = "https://github.com/Matoking/vdf/commit/981cad270c2558aeb8eccaf42cfcf9fabbbed199.patch"; + hash = "sha256-kLAbbB0WHjxq4rokLoGTPx43BU44EshteR59Ey9JnXo="; + }) + ]; + nativeCheckInputs = [ mock pytestCheckHook diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index c3c43163c671..9ae4d4d61052 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -8,6 +8,7 @@ , substituteAll , writeShellScript , steam-run +, fetchpatch2 , winetricks , yad , pytestCheckHook @@ -16,13 +17,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Matoking"; - repo = pname; - rev = version; - sha256 = "sha256-a40IAFrzQ0mogMoXKb+Lp0fPc1glYophqtftigk3nAc="; + repo = "protontricks"; + rev = "refs/tags/${version}"; + hash = "sha256-dCb8mcwXoxD4abJjLEwk5tGp65XkvepmOX+Kc9Dl7fQ="; }; patches = [ @@ -34,6 +35,19 @@ buildPythonApplication rec { exec ${lib.getExe steam-run} bash "$@" ''; }) + + # Revert vendored vdf since our vdf includes `appinfo.vdf` v29 support + (fetchpatch2 { + url = "https://github.com/Matoking/protontricks/commit/4198b7ea82369a91e3084d6e185f9b370f78eaec.patch"; + revert = true; + hash = "sha256-1U/LiAliKtk3ygbIBsmoavXN0RSykiiegtml+bO8CnI="; + }) + + # Fix test_run_no_args test + (fetchpatch2 { + url = "https://github.com/Matoking/protontricks/commit/ff2381ad379a612e73f0d4604f1c9c3a012b3355.patch"; + hash = "sha256-aiafLbiqS6TBBiQpfTYPVqhQs2OXYg/4yCtbuTv6Ug8="; + }) ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6314d657fdfb..4a0c2cbc94e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37250,7 +37250,8 @@ with pkgs; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { - inherit winetricks steam-run yad; + steam-run = steamPackages.steam-fhsenv-without-steam.run; + inherit winetricks yad; }; protonup-ng = with python3Packages; toPythonApplication protonup-ng;