diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/bottles/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/bottles/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/misc/bottles/default.nix b/nixpkgs/pkgs/applications/misc/bottles/default.nix index 865e3a849a1d..b0b1718c87b5 100644 --- a/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -4,7 +4,7 @@ , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome , steam, xdg-utils, pciutils, cabextract, wineWowPackages -, freetype, p7zip, gamemode +, freetype, p7zip, gamemode, mangohud , bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs , bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs }: @@ -12,7 +12,7 @@ let steam-run = (steam.override { # required by wine runner `caffe` - extraLibraries = pkgs: with pkgs; [ libunwind libusb1 ] + extraLibraries = pkgs: with pkgs; [ libunwind libusb1 gnutls ] ++ bottlesExtraLibraries pkgs; extraPkgs = pkgs: [ ] ++ bottlesExtraPkgs pkgs; @@ -20,8 +20,10 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.2.28-trento-1"; - sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds="; + version = "2022.3.14-trento-3"; + sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq"; + # Note: Update via pkgs/applications/misc/bottles/update.py + # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py src = fetchFromGitHub { owner = "bottlesdevs"; @@ -80,6 +82,7 @@ python3Packages.buildPythonApplication rec { freetype p7zip gamemode # programs.gamemode.enable + mangohud ]; format = "other"; @@ -89,13 +92,19 @@ python3Packages.buildPythonApplication rec { preConfigure = '' patchShebangs build-aux/meson/postinstall.py substituteInPlace src/backend/wine/winecommand.py \ - --replace '= f"{Paths.runners}' '= f"${steam-run}/bin/steam-run {Paths.runners}' + --replace \ + 'self.__get_runner()' \ + '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' ''; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = ./update.py; + }; + meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; |