Skip to content

Commit

Permalink
Merge pull request NixOS#64705 from MetaDark/protontricks
Browse files Browse the repository at this point in the history
protontricks: init at 1.2.3
  • Loading branch information
aanderse authored Jul 20, 2019
2 parents 1b6d404 + 5d053d8 commit 1af592d
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 0 deletions.
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3272,6 +3272,11 @@
email = "[email protected]";
name = "Celine Mercier";
};
metadark = {
email = "[email protected]";
name = "Kira Bruneau";
github = "metadark";
};
mfossen = {
email = "[email protected]";
github = "mfossen";
Expand Down
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/vdf/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, pytest, pytestcov, mock }:

buildPythonPackage rec {
pname = "vdf";
version = "3.1";

src = fetchFromGitHub {
owner = "ValvePython";
repo = pname;
rev = "v${version}";
sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr";
};

checkInputs = [ pytest pytestcov mock ];
checkPhase = "make test";

meta = with stdenv.lib; {
description = "Library for working with Valve's VDF text format";
homepage = https://github.com/ValvePython/vdf;
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
};
}
40 changes: 40 additions & 0 deletions pkgs/tools/package-management/protontricks/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ stdenv, lib, buildPythonApplication, fetchFromGitHub
, vdf, wine, winetricks, zenity
}:

buildPythonApplication rec {
pname = "protontricks";
version = "1.2.3";

src = fetchFromGitHub {
owner = "Matoking";
repo = pname;
rev = version;
sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn";
};

propagatedBuildInputs = [ vdf ];

# The wine install shipped with Proton must run under steam's
# chrootenv, but winetricks and zenity break when running under
# it. See https://github.com/NixOS/nix/issues/902.
#
# The current workaround is to use wine from nixpkgs
makeWrapperArgs = [
"--set STEAM_RUNTIME 0"
"--set-default WINE ${wine}/bin/wine"
"--set-default WINESERVER ${wine}/bin/wineserver"
"--prefix PATH : ${lib.makeBinPath [
(winetricks.override { inherit wine; })
zenity
]}"
];

meta = with stdenv.lib; {
description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
homepage = https://github.com/Matoking/protontricks;
license = licenses.gpl3;
platforms = with platforms; linux;
maintainers = with maintainers; [ metadark ];
};
}
6 changes: 6 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22028,6 +22028,12 @@ in
gtk = pkgs.gtk3;
};

protontricks = callPackage ../tools/package-management/protontricks {
inherit (python3Packages) buildPythonApplication vdf;
inherit (gnome3) zenity;
wine = wineWowPackages.minimal;
};

stepmania = callPackage ../games/stepmania {
ffmpeg = ffmpeg_2;
};
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,8 @@ in {

pyunifi = callPackage ../development/python-modules/pyunifi { };

vdf = callPackage ../development/python-modules/vdf { };

vidstab = callPackage ../development/python-modules/vidstab { };

webapp2 = callPackage ../development/python-modules/webapp2 { };
Expand Down

0 comments on commit 1af592d

Please sign in to comment.