From c7b5cfab44ac1915ae81bf329dd272f3e858b722 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Fri, 12 Jul 2019 22:08:21 -0400 Subject: [PATCH 1/3] maintainers: add metadark --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d686a109a4..8a57f3539a6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3248,6 +3248,11 @@ email = "softs@metabarcoding.org"; name = "Celine Mercier"; }; + metadark = { + email = "kira.bruneau@gmail.com"; + name = "Kira Bruneau"; + github = "metadark"; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; From a3f452ed0ce7374fe31215c268d08370004e0eeb Mon Sep 17 00:00:00 2001 From: MetaDark Date: Fri, 12 Jul 2019 22:12:23 -0400 Subject: [PATCH 2/3] pythonPackages.vdf: init at 3.1 --- .../python-modules/vdf/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/vdf/default.nix diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix new file mode 100644 index 00000000000..1c924d8973d --- /dev/null +++ b/pkgs/development/python-modules/vdf/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b68624dedec..95c9d1a25ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1010,6 +1010,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 { }; From 5d053d83339da54c898f6c3de83fef52a9c39837 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Fri, 12 Jul 2019 23:03:35 -0400 Subject: [PATCH 3/3] protontricks: init at 1.2.3 fixes #61193 --- .../protontricks/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/package-management/protontricks/default.nix diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix new file mode 100644 index 00000000000..ae8dfc59075 --- /dev/null +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69b571d2f92..547b5ae7f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22014,6 +22014,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; };