From cb41c9c23e156274436ee336c6e69b93e0d73045 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Wed, 18 Aug 2021 00:36:35 -0600 Subject: [PATCH] bottles: added `cabextract` and `wineWowPacakge.minimal` > cabextract is needed to install wants using the dependencies menu. The wine packages are needed when switching dxvk or vkd3d in a bottle. Based on review by mschuwalow --- pkgs/applications/misc/bottles/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8f7bfc4520fb..52f4e8def20e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -3,7 +3,7 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native, xdg-utils, pciutils +, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages }: python3Packages.buildPythonApplication rec { @@ -54,9 +54,11 @@ python3Packages.buildPythonApplication rec { liblarch patool ] ++ [ - steam-run-native + steam-run xdg-utils pciutils + cabextract + wineWowPackages.minimal ]; format = "other"; @@ -67,10 +69,10 @@ python3Packages.buildPythonApplication rec { 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-native}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + --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-native}/bin/steam-run {runner}" \ + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ ''; preFixup = ''