diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-30 14:52:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 14:52:15 +0800 |
| commit | 417225acdd9054f2ae08079caa0f46f31fd1b650 (patch) | |
| tree | d4d46153741d955e058df56be0eb82c9fabb1566 | |
| parent | f2d8264f698447aa3d37fe243f2bdf5c775db9ed (diff) | |
| parent | 57b0e8d4134120971e7586e0d3b5983d88fcf520 (diff) | |
Merge pull request #151224 from psydvl/bottles
bottles: 2021.7.28-treviso-2 -> 2021.12.28-treviso
| -rw-r--r-- | pkgs/applications/misc/bottles/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 52f4e8def20e..85d801e2ec3c 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,20 +1,21 @@ { lib, fetchFromGitHub , meson, ninja, pkg-config, wrapGAppsHook -, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy +, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk , python3Packages, gettext -, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 +, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gnome , steam-run, xdg-utils, pciutils, cabextract, wineWowPackages +, freetype, p7zip, gamemode }: python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.28-treviso-2"; + version = "2021.12.28-treviso"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; + sha256 = "lZbSLLBg7XM6PuOmu5rJ15dg+QHHRcjijRYE6u3WT9Y="; }; postPatch = '' @@ -41,10 +42,13 @@ python3Packages.buildPythonApplication rec { gtk3 libhandy libnotify + webkitgtk + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyyaml + pytoml requests pycairo pygobject3 @@ -53,12 +57,16 @@ python3Packages.buildPythonApplication rec { gst-python liblarch patool + markdown ] ++ [ steam-run xdg-utils pciutils cabextract wineWowPackages.minimal + freetype + p7zip + gamemode # programs.gamemode.enable ]; format = "other"; @@ -66,13 +74,9 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; # prevent double wrapping preConfigure = '' - substituteInPlace build-aux/meson/postinstall.py \ - --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" - substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" - substituteInPlace src/runner_utilities.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/backend/runner.py \ + --replace "{Paths.runners}" "${steam-run}/bin/steam-run {Paths.runners}" ''; preFixup = '' |