From e27664274c94f4e3b4af035922a13035e8a5d47b Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 19 Sep 2024 11:17:17 -0400
Subject: [PATCH 1/3] python312Packages.vdf: add patch to support appinfo.vdf
 v29

(cherry picked from commit 1c0e78c92b1d03232e00f40ecb41c5725f5543ac)
---
 pkgs/development/python-modules/vdf/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

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

From 6b99175c4610d336592a4aff6ec19a2ab8b1d769 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 19 Sep 2024 11:00:25 -0400
Subject: [PATCH 2/3] protontricks: 1.11.1 -> 1.12.0

(cherry picked from commit 8482aefb4f11a002f73ee36a4badf650cd2375b2)
---
 .../protontricks/default.nix                  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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 ];

From 6d936451ed3c9c7e2b2326f1c58b29028694084b Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 19 Sep 2024 12:21:48 -0400
Subject: [PATCH 3/3] protontricks: use steam-run-free

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6568285fd62b..c025a82443cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37251,7 +37251,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;