Skip to content

Commit caddb15

Browse files
authored
bottles: update patches, add gamemode to propagatedBuildInputs (#408450)
2 parents 84eab96 + 006b8bc commit caddb15

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
lsb-release,
2121
pciutils,
2222
procps,
23+
gamemode,
2324
gamescope,
2425
mangohud,
2526
vkbasalt-cli,
2627
vmtouch,
2728
libportal,
2829
nix-update-script,
29-
removeWarningPopup ? false, # Final reminder to report any issues on nixpkgs' bugtracker
30+
removeWarningPopup ? false,
3031
}:
3132

3233
python3Packages.buildPythonApplication rec {
@@ -103,6 +104,7 @@ python3Packages.buildPythonApplication rec {
103104
imagemagick
104105
vkbasalt-cli
105106

107+
gamemode
106108
gamescope
107109
mangohud
108110
vmtouch

pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py
2-
index 79bf0d72..e37ca43e 100644
3-
--- a/bottles/frontend/windows/main_window.py
4-
index 79bf0d72..e37ca43e 100644
5-
--- a/bottles/frontend/windows/main_window.py
6-
+++ b/bottles/frontend/windows/main_window.py
7-
@@ -104,29 +104,15 @@ class MainWindow(Adw.ApplicationWindow):
1+
diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py
2+
index 802b08b5..c4cada1d 100644
3+
--- a/bottles/frontend/windows/window.py
4+
+++ b/bottles/frontend/windows/window.py
5+
@@ -102,29 +102,15 @@ class BottlesWindow(Adw.ApplicationWindow):
86

97
def response(dialog, response, *args):
108
if response == "close":

pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py
2-
index 79bf0d72..e3a15cb5 100644
2+
index 802b08b5..e3de0536 100644
33
--- a/bottles/frontend/windows/window.py
44
+++ b/bottles/frontend/windows/window.py
5-
@@ -104,29 +104,29 @@ class MainWindow(Adw.ApplicationWindow):
5+
@@ -102,29 +102,30 @@ class BottlesWindow(Adw.ApplicationWindow):
66

77
def response(dialog, response, *args):
88
if response == "close":
@@ -15,15 +15,15 @@ index 79bf0d72..e3a15cb5 100644
1515
)
1616
- download_url = "usebottles.com/download"
1717
+ bugtracker_url = "github.com/NixOS/nixpkgs/issues"
18+
+
1819

1920
error_dialog = Adw.AlertDialog.new(
2021
_("Unsupported Environment"),
2122
- f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>",
22-
+ f"{body} <a href='https://{bugtracker_url}' title='https://{bugtracker_url}'>{bugtracker_url}.</a>",
23+
+ f"{body} <a href='https://{bugtracker_url}' title='https://{bugtracker_url}'>{bugtracker_url}.</a> \nThis warning can be disabled by overriding the package: `(pkgs.bottles.override {{ removeWarningPopup = false; }})`",
2324
)
2425

25-
- error_dialog.add_response("close", _("Close"))
26-
+ error_dialog.add_response("close", _("Understood"))
26+
error_dialog.add_response("close", _("Close"))
2727
error_dialog.set_body_use_markup(True)
2828
error_dialog.connect("response", response)
2929
error_dialog.present(self)

0 commit comments

Comments
 (0)