commit:     8674acb19e12ad3606a425595bd06942967ad7a6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Dec 10 16:33:35 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Dec 10 16:33:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8674acb1

gui-wm/niri: launch via dbus-run-session when dbus is enabled

Closes: https://bugs.gentoo.org/967215
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 gui-wm/niri/{niri-25.11.ebuild => niri-25.11-r1.ebuild} | 4 +++-
 gui-wm/niri/niri-9999.ebuild                            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gui-wm/niri/niri-25.11.ebuild b/gui-wm/niri/niri-25.11-r1.ebuild
similarity index 96%
rename from gui-wm/niri/niri-25.11.ebuild
rename to gui-wm/niri/niri-25.11-r1.ebuild
index 49b0c84465..537de30ea6 100644
--- a/gui-wm/niri/niri-25.11.ebuild
+++ b/gui-wm/niri/niri-25.11-r1.ebuild
@@ -87,7 +87,9 @@ src_prepare() {
        sed -i 's/git = "[^ ]*"/version = "*"/' Cargo.toml || die
        # niri-session doesn't work on OpenRC
        if ! use systemd; then
-               sed -i 's/niri-session/niri --session/' resources/niri.desktop 
|| die
+               local cmd="niri --session"
+               use dbus && cmd="dbus-run-session $cmd"
+               sed -i "s/niri-session/$cmd/" resources/niri.desktop || die
        fi
        default
 }

diff --git a/gui-wm/niri/niri-9999.ebuild b/gui-wm/niri/niri-9999.ebuild
index 49b0c84465..537de30ea6 100644
--- a/gui-wm/niri/niri-9999.ebuild
+++ b/gui-wm/niri/niri-9999.ebuild
@@ -87,7 +87,9 @@ src_prepare() {
        sed -i 's/git = "[^ ]*"/version = "*"/' Cargo.toml || die
        # niri-session doesn't work on OpenRC
        if ! use systemd; then
-               sed -i 's/niri-session/niri --session/' resources/niri.desktop 
|| die
+               local cmd="niri --session"
+               use dbus && cmd="dbus-run-session $cmd"
+               sed -i "s/niri-session/$cmd/" resources/niri.desktop || die
        fi
        default
 }

Reply via email to