diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/by-name/pr/protontricks/package.nix similarity index 76% rename from pkgs/tools/package-management/protontricks/default.nix rename to pkgs/by-name/pr/protontricks/package.nix index 0d09dbff1778..212bdc22eb86 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/by-name/pr/protontricks/package.nix @@ -1,39 +1,35 @@ { 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"; + version = "1.13.1"; pyproject = true; src = fetchFromGitHub { owner = "Matoking"; repo = "protontricks"; tag = version; - hash = "sha256-6z6J31EBXf0FU3fWjjg3dX7OAOiN9Z3ONdKIweJiZBY="; + hash = "sha256-YJUNp+8n1LPlD7lCAy6AMNxToloPBn8ZaRfREiwS9ls="; }; 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. @@ -76,12 +72,12 @@ buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; changelog = "https://github.com/Matoking/protontricks/blob/${src.tag}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ kira-bruneau ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" "i686-linux" 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 362b1a17d5be..03ccaa9d18c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13173,11 +13173,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; };