bottles-unwrapped: 52.1 -> 60.1 (#464657)

pkgs/by-name/bo/bottles-unwrapped/package.nix

@@ -32,19 +32,20 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "52.1";
+  version = "60.1";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-KRSFljHUB5JEk2saCb0voIukekeUSySinBICBrzY9eQ=";
+    hash = "sha256-d9nRT6AvFxnhI/theJtPg79EdmA+9UFS4OWDlkV03sA=";
   };
 
   patches = [
     ./vulkan_icd.patch
     ./redirect-bugtracker.patch
     ./remove-flatpak-check.patch
+    ./terminal.patch # Needed for `Launch with Terminal`
   ]
   ++ (
     if removeWarningPopup then

pkgs/by-name/bo/bottles-unwrapped/terminal.patch

@@ -0,0 +1,13 @@
+diff --git a/bottles/backend/utils/terminal.py b/bottles/backend/utils/terminal.py
+index 1f28e093..cca8018a 100644
+--- a/bottles/backend/utils/terminal.py
++++ b/bottles/backend/utils/terminal.py
+@@ -138,7 +138,7 @@ class TerminalUtils:
+                 full_cmd = f"{template} {cmd_for_shell}"
+
+         elif term_bin in ["kitty", "foot", "konsole", "gnome-terminal"]:
+-            cmd_for_shell = shlex.quote(f"sh -c {command}")
++            cmd_for_shell = f"sh -c {command}"
+             try:
+                 full_cmd = template % cmd_for_shell
+             except Exception:

pkgs/by-name/bo/bottles/package.nix

@@ -54,6 +54,11 @@ let
             gst-plugins-bad
             gst-libav
           ];
+        waylandDeps =
+          pkgs: with pkgs; [
+            libxkbcommon
+            wayland
+          ];
       in
       pkgs:
       with pkgs;
@@ -106,7 +111,8 @@ let
       ]
       ++ xorgDeps pkgs
       ++ gstreamerDeps pkgs
-      ++ extraLibraries pkgs;
+      ++ extraLibraries pkgs
+      ++ waylandDeps pkgs;
   };
 in
 symlinkJoin {