diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-07-19 20:45:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 20:45:27 -0400 |
| commit | 1af592d65fb3f73c536c520e990314e1ad096258 (patch) | |
| tree | ba2694776bcfb84c712009944f8e709c241135fc /pkgs/top-level | |
| parent | 1b6d404bfecdc8f2cbb83a3f204c0e1f61ea0501 (diff) | |
| parent | 5d053d83339da54c898f6c3de83fef52a9c39837 (diff) | |
Merge pull request #64705 from MetaDark/protontricks
protontricks: init at 1.2.3
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03ae106c481a8..5841061c8409e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdff7d770dbb6..c16b2f83ae348 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; |