[neon/snap-packaging/plasma-desktop-session] scripts: Don't set PIPEWIRE_RUNTIME_DIR in the activation environment
Kevin Ottens
null at kde.org
Tue Apr 22 15:33:22 BST 2025
Git commit cdc2c8d063a56c3f167f703eb3e2f79d45193461 by Kevin Ottens.
Committed on 22/04/2025 at 14:31.
Pushed by ervin into branch 'master'.
Don't set PIPEWIRE_RUNTIME_DIR in the activation environment
We set it for each service but not on the whole session, otherwise it's
set in the activation environment. When that happens, applications (like
Firefox) will want to use the Pipewire socket directly and will fail at
locking it.
M +1 -0 scripts/run-after.sh
M +1 -0 scripts/run-portal.sh
M +0 -1 scripts/run-session.sh
M +1 -0 scripts/run.sh
https://invent.kde.org/neon/snap-packaging/plasma-desktop-session/-/commit/cdc2c8d063a56c3f167f703eb3e2f79d45193461
diff --git a/scripts/run-after.sh b/scripts/run-after.sh
index 0d7d5de..5012a17 100755
--- a/scripts/run-after.sh
+++ b/scripts/run-after.sh
@@ -1,5 +1,6 @@
#!/bin/sh
export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
+export PIPEWIRE_RUNTIME_DIR=/run/user/`id -u`
SERVICE=$1
shift
diff --git a/scripts/run-portal.sh b/scripts/run-portal.sh
index 59ebd7a..8cad40e 100755
--- a/scripts/run-portal.sh
+++ b/scripts/run-portal.sh
@@ -1,5 +1,6 @@
#!/bin/sh
export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
+export PIPEWIRE_RUNTIME_DIR=/run/user/`id -u`
# This is necessary to avoid xdg-desktop-portal-kde have Qt try
# to load the xdg-desktop-portal platform theme plugin
diff --git a/scripts/run-session.sh b/scripts/run-session.sh
index 19cf0d8..8f5fa63 100755
--- a/scripts/run-session.sh
+++ b/scripts/run-session.sh
@@ -20,7 +20,6 @@ export XDG_RUNTIME_DIR=/run/user/`id -u`
chmod 700 $XDG_RUNTIME_DIR/snap.$SNAP_NAME
export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
-export PIPEWIRE_RUNTIME_DIR=$XDG_RUNTIME_DIR
export XDG_CURRENT_DESKTOP=KDE
export _KDE_APPLICATIONS_AS_FORKING=1
diff --git a/scripts/run.sh b/scripts/run.sh
index 00f1307..0ee9cf2 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -1,3 +1,4 @@
#!/bin/sh
export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
+export PIPEWIRE_RUNTIME_DIR=/run/user/`id -u`
exec "$@"
More information about the Neon-commits
mailing list