[neon/snap-packaging/plasma-desktop-session] /: Pipewire isn't in the content snap anymore, remove the services

[Kevin Ottens]

Git commit b1c8cc772008d63db95e397ff83fa1e9f76b6d14 by Kevin Ottens.
Committed on 19/03/2025 at 16:22.
Pushed by ervin into branch 'master'.

Pipewire isn't in the content snap anymore, remove the services

M  +1    -0    scripts/run-session.sh
M  +5    -56   snap/snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/plasma-desktop-session/-/commit/b1c8cc772008d63db95e397ff83fa1e9f76b6d14

diff --git a/scripts/run-session.sh b/scripts/run-session.sh
index 8f5fa63..19cf0d8 100755
--- a/scripts/run-session.sh
+++ b/scripts/run-session.sh
@@ -20,6 +20,7 @@ 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/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e5617ad..8b01e39 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -49,10 +49,6 @@ layout:
     symlink: $SNAP/plasma/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
     symlink: $SNAP/plasma/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
-  /usr/share/wireplumber:
-    symlink: $SNAP/plasma/usr/share/wireplumber
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/wireplumber-0.4:
-    symlink: $SNAP/plasma/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/wireplumber-0.4
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vdpau:
     symlink: $SNAP/plasma/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vdpau
   /usr/share/drirc.d:
@@ -313,50 +309,6 @@ apps:
       - desktop
     autostart: org.kde.xwaylandvideobridge.desktop
 
-  pipewire:
-    command: run.sh $SNAP/plasma/usr/bin/pipewire
-    daemon: simple
-    sockets:
-      pipewire:
-        listen-stream: $XDG_RUNTIME_DIR/pipewire-0
-        socket-mode: 0644
-      pipewire-manager:
-        listen-stream: $XDG_RUNTIME_DIR/pipewire-0-manager
-        socket-mode: 0644
-    passthrough:
-      daemon-scope: user
-    slots:
-      - audio-playback
-      - audio-record
-    plugs:
-      - alsa
-    before:
-      - wireplumber
-
-  pipewire-pulse:
-    command: run.sh $SNAP/plasma/usr/bin/pipewire-pulse
-    daemon: simple
-    sockets:
-      pulse:
-        listen-stream: $XDG_RUNTIME_DIR/pulse/native
-    passthrough:
-      daemon-scope: user
-    slots:
-      - audio-playback
-      - audio-record
-      - pulseaudio
-    plugs:
-      - alsa
-
-  wireplumber:
-    command: run.sh $SNAP/plasma/usr/bin/wireplumber
-    daemon: simple
-    passthrough:
-      daemon-scope: user
-    after:
-      - pipewire
-    plugs:
-      - alsa
 
 plugs:
   kf6-core24:
@@ -367,6 +319,9 @@ plugs:
     content: plasma-core24
     interface: content
     target: $SNAP/plasma
+
+  audio-playback: null
+  audio-record: null
   avahi-control: null
   bluez: null
   bluetooth-control: null
@@ -387,6 +342,8 @@ plugs:
   network-observe: null
   network-manager: null
   opengl: null
+  pulseaudio: null
+  pipewire: null
   process-control: null
   shutdown: null
   ssh-keys: null
@@ -644,18 +601,10 @@ slots:
     interface: dbus
     bus: session
     name: org.kde.StatusNotifierHost
-  dbus-pulseaudio-server:
-    interface: dbus
-    bus: session
-    name: org.pulseaudio.Server
   dbus-portal:
     interface: dbus
     name: org.freedesktop.impl.portal.PermissionStore
     bus: session
-  dbus-wireplumber:
-    interface: dbus
-    name: org.freedesktop.ReserveDevice1
-    bus: session
   dbus-unity:
     interface: dbus
     name: com.canonical.Unity