Commit b21e3d6d authored by Kira Bruneau's avatar Kira Bruneau
Browse files

protontricks: move to by-name

parent 1d4c8832

pkgs/tools/package-management/protontricks/default.nix→pkgs/by-name/pr/protontricks/package.nix

+8 −12
Original line number Diff line number Diff line 
{

  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.

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -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; };