From b21e3d6d41da37ebb02cb7bf84958677dc939171 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 16 Nov 2025 11:47:31 -0500
Subject: [PATCH] protontricks: move to by-name

---
 .../pr/protontricks/package.nix}              | 20 ++++++++-----------
 .../pr}/protontricks/steam-run.patch          |  0
 pkgs/top-level/all-packages.nix               |  5 -----
 3 files changed, 8 insertions(+), 17 deletions(-)
 rename pkgs/{tools/package-management/protontricks/default.nix => by-name/pr/protontricks/package.nix} (85%)
 rename pkgs/{tools/package-management => by-name/pr}/protontricks/steam-run.patch (100%)

diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/by-name/pr/protontricks/package.nix
similarity index 85%
rename from pkgs/tools/package-management/protontricks/default.nix
rename to pkgs/by-name/pr/protontricks/package.nix
index 0d09dbff1778..190e3057f97d 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/by-name/pr/protontricks/package.nix
@@ -1,22 +1,18 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   replaceVars,
   writeShellScript,
-  steam-run,
+  steam-run-free,
   fetchpatch2,
-  setuptools-scm,
-  vdf,
-  pillow,
   winetricks,
   yad,
-  pytestCheckHook,
   nix-update-script,
   extraCompatPaths ? "",
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "protontricks";
   version = "1.13.0";
   pyproject = true;
@@ -31,9 +27,9 @@ buildPythonApplication rec {
   patches = [
     # Use steam-run to run Proton binaries
     (replaceVars ./steam-run.patch {
-      steamRun = lib.getExe steam-run;
+      steamRun = lib.getExe steam-run-free;
       bash = writeShellScript "steam-run-bash" ''
-        exec ${lib.getExe steam-run} bash "$@"
+        exec ${lib.getExe steam-run-free} bash "$@"
       '';
     })
 
@@ -45,9 +41,9 @@ buildPythonApplication rec {
     })
   ];
 
-  build-system = [ setuptools-scm ];
+  build-system = with python3Packages; [ setuptools-scm ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     vdf
     pillow
   ];
@@ -64,7 +60,7 @@ buildPythonApplication rec {
   ]
   ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
   # From 1.6.0 release notes (https://github.com/Matoking/protontricks/releases/tag/1.6.0):
   # In most cases the script is unnecessary and should be removed as part of the packaging process.
diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/by-name/pr/protontricks/steam-run.patch
similarity index 100%
rename from pkgs/tools/package-management/protontricks/steam-run.patch
rename to pkgs/by-name/pr/protontricks/steam-run.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d79a0a739829..cc5ba6a2fc7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13208,11 +13208,6 @@ with pkgs;
 
   steamback = python3.pkgs.callPackage ../tools/games/steamback { };
 
-  protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
-    steam-run = steam-run-free;
-    inherit winetricks yad;
-  };
-
   protonup-ng = with python3Packages; toPythonApplication protonup-ng;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };