git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #64705 from MetaDark/protontricks

protontricks: init at 1.2.3

commit1af592d65fb3f73c536c520e990314e1ad096258 authorAaron Andersen <aaron@fosslib.net> dateFri 19 Jul 2019, 20:45 (7 years ago) parent1b6d4045d053d8
5 files changed+77
maintainers/maintainer-list.nix+5 pkgs/development/python-modules/vdf/default.nix+24 pkgs/tools/package-management/protontricks/default.nix+40 pkgs/top-level/all-packages.nix+6 pkgs/top-level/python-packages.nix+2
maintainers/maintainer-list.nix+5
@@ -3272,6 +3272,11 @@
32723272 email = "softs@metabarcoding.org";
32733273 name = "Celine Mercier";
32743274 };
3275+ metadark = {
3276+ email = "kira.bruneau@gmail.com";
3277+ name = "Kira Bruneau";
3278+ github = "metadark";
3279+ };
32753280 mfossen = {
32763281 email = "msfossen@gmail.com";
32773282 github = "mfossen";
pkgs/development/python-modules/vdf/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildPythonPackage, fetchFromGitHub
2+, pytest, pytestcov, mock }:
3+
4+buildPythonPackage rec {
5+ pname = "vdf";
6+ version = "3.1";
7+
8+ src = fetchFromGitHub {
9+ owner = "ValvePython";
10+ repo = pname;
11+ rev = "v${version}";
12+ sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr";
13+ };
14+
15+ checkInputs = [ pytest pytestcov mock ];
16+ checkPhase = "make test";
17+
18+ meta = with stdenv.lib; {
19+ description = "Library for working with Valve's VDF text format";
20+ homepage = https://github.com/ValvePython/vdf;
21+ license = licenses.mit;
22+ maintainers = with maintainers; [ metadark ];
23+ };
24+}
pkgs/tools/package-management/protontricks/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ stdenv, lib, buildPythonApplication, fetchFromGitHub
2+, vdf, wine, winetricks, zenity
3+}:
4+
5+buildPythonApplication rec {
6+ pname = "protontricks";
7+ version = "1.2.3";
8+
9+ src = fetchFromGitHub {
10+ owner = "Matoking";
11+ repo = pname;
12+ rev = version;
13+ sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn";
14+ };
15+
16+ propagatedBuildInputs = [ vdf ];
17+
18+ # The wine install shipped with Proton must run under steam's
19+ # chrootenv, but winetricks and zenity break when running under
20+ # it. See https://github.com/NixOS/nix/issues/902.
21+ #
22+ # The current workaround is to use wine from nixpkgs
23+ makeWrapperArgs = [
24+ "--set STEAM_RUNTIME 0"
25+ "--set-default WINE ${wine}/bin/wine"
26+ "--set-default WINESERVER ${wine}/bin/wineserver"
27+ "--prefix PATH : ${lib.makeBinPath [
28+ (winetricks.override { inherit wine; })
29+ zenity
30+ ]}"
31+ ];
32+
33+ meta = with stdenv.lib; {
34+ description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
35+ homepage = https://github.com/Matoking/protontricks;
36+ license = licenses.gpl3;
37+ platforms = with platforms; linux;
38+ maintainers = with maintainers; [ metadark ];
39+ };
40+}
pkgs/top-level/all-packages.nix+6
@@ -22028,6 +22028,12 @@ in
2202822028 gtk = pkgs.gtk3;
2202922029 };
2203022030
22031+ protontricks = callPackage ../tools/package-management/protontricks {
22032+ inherit (python3Packages) buildPythonApplication vdf;
22033+ inherit (gnome3) zenity;
22034+ wine = wineWowPackages.minimal;
22035+ };
22036+
2203122037 stepmania = callPackage ../games/stepmania {
2203222038 ffmpeg = ffmpeg_2;
2203322039 };
pkgs/top-level/python-packages.nix+2
@@ -1168,6 +1168,8 @@ in {
11681168
11691169 pyunifi = callPackage ../development/python-modules/pyunifi { };
11701170
1171+ vdf = callPackage ../development/python-modules/vdf { };
1172+
11711173 vidstab = callPackage ../development/python-modules/vidstab { };
11721174
11731175 webapp2 = callPackage ../development/python-modules/webapp2 { };