bottles-unwrapped: 62.0 -> 63.2 (#503842)
This commit is contained in:
@@ -32,20 +32,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "bottles-unwrapped";
|
||||
version = "62.0";
|
||||
version = "63.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = "bottles";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UqK5ULFgNPe9r2xFolU1R5LnlD3kLgBK0qGl48elEwM=";
|
||||
hash = "sha256-cBqKUf96BLYyVD8onkvejL7pcxYrVCnhjhhT9FSwuNo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./vulkan_icd.patch
|
||||
./redirect-bugtracker.patch
|
||||
./remove-flatpak-check.patch
|
||||
./terminal.patch # Needed for `Launch with Terminal`
|
||||
]
|
||||
++ (
|
||||
if removeWarningPopup then
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
diff --git a/bottles/backend/utils/terminal.py b/bottles/backend/utils/terminal.py
|
||||
index 943cface..1f67822e 100644
|
||||
--- a/bottles/backend/utils/terminal.py
|
||||
+++ b/bottles/backend/utils/terminal.py
|
||||
@@ -132,21 +132,21 @@ class TerminalUtils:
|
||||
full_cmd = f"{template} {palette} {cmd_for_shell}"
|
||||
|
||||
elif term_bin == "xfce4-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:
|
||||
full_cmd = f"{template} {cmd_for_shell}"
|
||||
|
||||
elif term_bin in ["kitty", "foot", "konsole", "gnome-terminal", "wezterm"]:
|
||||
- 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:
|
||||
full_cmd = f"{template} {cmd_for_shell}"
|
||||
|
||||
else:
|
||||
- cmd_for_shell = shlex.quote(f"bash -c {command}")
|
||||
+ cmd_for_shell = f"sh -c {command}"
|
||||
try:
|
||||
full_cmd = template % cmd_for_shell
|
||||
except Exception:
|
||||
Reference in New Issue
Block a user