Unverified Commit 0b9b52b2 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

[Backport release-25.11] bottles-unwrapped: 52.1 -> 60.1 (#466447)

parents 592d1d30 9031f0ac
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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
+13 −0
Original line number Diff line number Diff line
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:
+7 −1
Original line number Diff line number Diff line
@@ -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 {