From 400b8c420cec2c5127163249d2e97177599f9199 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 18 May 2025 19:22:44 +0200 Subject: [PATCH 1/3] bottles: update `remove-unsupported-warning.patch` --- .../remove-unsupported-warning.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch index ed0ba631d3a7..1f343ff174d6 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch @@ -1,10 +1,8 @@ -diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py -index 79bf0d72..e37ca43e 100644 ---- a/bottles/frontend/windows/main_window.py -index 79bf0d72..e37ca43e 100644 ---- a/bottles/frontend/windows/main_window.py -+++ b/bottles/frontend/windows/main_window.py -@@ -104,29 +104,15 @@ class MainWindow(Adw.ApplicationWindow): +diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py +index 802b08b5..c4cada1d 100644 +--- a/bottles/frontend/windows/window.py ++++ b/bottles/frontend/windows/window.py +@@ -102,29 +102,15 @@ class BottlesWindow(Adw.ApplicationWindow): def response(dialog, response, *args): if response == "close": From bb8327b825d9e11df96c95512c43ef9228aacb93 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 18 May 2025 19:27:32 +0200 Subject: [PATCH 2/3] bottles: add info to disable unsupported popup --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 2 +- .../bo/bottles-unwrapped/warn-unsupported.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index baed4eb662a1..eb74beb2f98e 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -26,7 +26,7 @@ vmtouch, libportal, nix-update-script, - removeWarningPopup ? false, # Final reminder to report any issues on nixpkgs' bugtracker + removeWarningPopup ? false, }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch index a1529e1ba6fa..68e12802246e 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch @@ -1,8 +1,8 @@ diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py -index 79bf0d72..e3a15cb5 100644 +index 802b08b5..e3de0536 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py -@@ -104,29 +104,29 @@ class MainWindow(Adw.ApplicationWindow): +@@ -102,29 +102,30 @@ class BottlesWindow(Adw.ApplicationWindow): def response(dialog, response, *args): if response == "close": @@ -15,15 +15,15 @@ index 79bf0d72..e3a15cb5 100644 ) - download_url = "usebottles.com/download" + bugtracker_url = "github.com/NixOS/nixpkgs/issues" ++ error_dialog = Adw.AlertDialog.new( _("Unsupported Environment"), - f"{body} {download_url}.", -+ f"{body} {bugtracker_url}.", ++ f"{body} {bugtracker_url}. \nThis warning can be disabled by overriding the package: `(pkgs.bottles.override {{ removeWarningPopup = false; }})`", ) -- error_dialog.add_response("close", _("Close")) -+ error_dialog.add_response("close", _("Understood")) + error_dialog.add_response("close", _("Close")) error_dialog.set_body_use_markup(True) error_dialog.connect("response", response) error_dialog.present(self) From 006b8bc52ca2218f4dacebb8e281acc13dde15e3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 19 May 2025 00:52:33 +0200 Subject: [PATCH 3/3] bottles-unwrapped: add `gamemode` to `propagatedBuildInputs` --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index eb74beb2f98e..04f2d5927435 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -20,6 +20,7 @@ lsb-release, pciutils, procps, + gamemode, gamescope, mangohud, vkbasalt-cli, @@ -103,6 +104,7 @@ python3Packages.buildPythonApplication rec { imagemagick vkbasalt-cli + gamemode gamescope mangohud vmtouch