patches and low-level development discussion
 help / color / mirror / code / Atom feed
* [PATCH] Run PipeWire and WirePlumber in the VMs
@ 2025-07-04  2:13 Demi Marie Obenour
  0 siblings, 0 replies; only message in thread
From: Demi Marie Obenour @ 2025-07-04  2:13 UTC (permalink / raw)
  To: Spectrum OS Development

WirePlumber is completely overkill as a session manager here, and
ideally a trivial session manager would be used instead.  I did build a
Spectrum OS image and found that PipeWire and WirePlumber both
successfully started.  This does *not* start pipewire-pulse, so programs
using PulseAudio won't work.  That will come later.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
---
 img/app/Makefile                              | 16 +++++++++++++--
 img/app/default.nix                           |  5 ++++-
 img/app/etc/fstab                             |  5 +++--
 .../etc/s6-rc/app/dependencies.d/wireplumber  |  0
 .../app/dependencies.d/wireplumber.license    |  2 ++
 img/app/etc/s6-rc/directories/type            |  1 +
 img/app/etc/s6-rc/directories/type.license    |  2 ++
 img/app/etc/s6-rc/directories/up              | 11 ++++++++++
 .../s6-rc/pipewire/dependencies.d/directories |  0
 .../dependencies.d/directories.license        |  2 ++
 img/app/etc/s6-rc/pipewire/notification-fd    |  1 +
 .../s6-rc/pipewire/notification-fd.license    |  2 ++
 img/app/etc/s6-rc/pipewire/run                | 20 +++++++++++++++++++
 img/app/etc/s6-rc/pipewire/type               |  1 +
 img/app/etc/s6-rc/pipewire/type.license       |  2 ++
 .../dependencies.d/directories                |  0
 .../dependencies.d/directories.license        |  2 ++
 img/app/etc/s6-rc/wayland-proxy-virtwl/run    | 11 ----------
 .../etc/s6-rc/wireplumber/dependencies.d/dbus |  0
 .../wireplumber/dependencies.d/dbus.license   |  2 ++
 .../s6-rc/wireplumber/dependencies.d/pipewire |  0
 .../dependencies.d/pipewire.license           |  2 ++
 img/app/etc/s6-rc/wireplumber/run             |  4 ++++
 img/app/etc/s6-rc/wireplumber/type            |  1 +
 img/app/etc/s6-rc/wireplumber/type.license    |  2 ++
 25 files changed, 78 insertions(+), 16 deletions(-)
 create mode 100644 img/app/etc/s6-rc/app/dependencies.d/wireplumber
 create mode 100644 img/app/etc/s6-rc/app/dependencies.d/wireplumber.license
 create mode 100644 img/app/etc/s6-rc/directories/type
 create mode 100644 img/app/etc/s6-rc/directories/type.license
 create mode 100644 img/app/etc/s6-rc/directories/up
 create mode 100644 img/app/etc/s6-rc/pipewire/dependencies.d/directories
 create mode 100644 img/app/etc/s6-rc/pipewire/dependencies.d/directories.license
 create mode 100644 img/app/etc/s6-rc/pipewire/notification-fd
 create mode 100644 img/app/etc/s6-rc/pipewire/notification-fd.license
 create mode 100644 img/app/etc/s6-rc/pipewire/run
 create mode 100644 img/app/etc/s6-rc/pipewire/type
 create mode 100644 img/app/etc/s6-rc/pipewire/type.license
 create mode 100644 img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories
 create mode 100644 img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories.license
 create mode 100644 img/app/etc/s6-rc/wireplumber/dependencies.d/dbus
 create mode 100644 img/app/etc/s6-rc/wireplumber/dependencies.d/dbus.license
 create mode 100644 img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire
 create mode 100644 img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire.license
 create mode 100644 img/app/etc/s6-rc/wireplumber/run
 create mode 100644 img/app/etc/s6-rc/wireplumber/type
 create mode 100644 img/app/etc/s6-rc/wireplumber/type.license

diff --git a/img/app/Makefile b/img/app/Makefile
index c827fd3..07fdf6f 100644
--- a/img/app/Makefile
+++ b/img/app/Makefile
@@ -83,22 +83,34 @@ build/rootfs.erofs: ../../scripts/make-erofs.sh $(VM_FILES) $(VM_BUILD_FILES) bu
 VM_S6_RC_FILES = \
 	etc/s6-rc/app/dependencies.d/dbus \
 	etc/s6-rc/app/dependencies.d/wayland-proxy-virtwl \
+	etc/s6-rc/app/dependencies.d/wireplumber \
 	etc/s6-rc/app/run \
 	etc/s6-rc/app/type \
 	etc/s6-rc/dbus/notification-fd \
 	etc/s6-rc/dbus/run \
 	etc/s6-rc/dbus/type \
+	etc/s6-rc/directories/type \
+	etc/s6-rc/directories/up \
 	etc/s6-rc/mdevd-coldplug/dependencies \
 	etc/s6-rc/mdevd-coldplug/type \
 	etc/s6-rc/mdevd-coldplug/up \
 	etc/s6-rc/mdevd/notification-fd \
 	etc/s6-rc/mdevd/run \
 	etc/s6-rc/mdevd/type \
+	etc/s6-rc/ok-all/contents \
+	etc/s6-rc/ok-all/type \
+	etc/s6-rc/pipewire/dependencies.d/directories \
+	etc/s6-rc/pipewire/notification-fd \
+	etc/s6-rc/pipewire/run \
+	etc/s6-rc/pipewire/type \
+	etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories \
 	etc/s6-rc/wayland-proxy-virtwl/notification-fd \
 	etc/s6-rc/wayland-proxy-virtwl/run \
 	etc/s6-rc/wayland-proxy-virtwl/type \
-	etc/s6-rc/ok-all/contents \
-	etc/s6-rc/ok-all/type
+	etc/s6-rc/wireplumber/dependencies.d/dbus \
+	etc/s6-rc/wireplumber/dependencies.d/pipewire \
+	etc/s6-rc/wireplumber/run \
+	etc/s6-rc/wireplumber/type
 
 build/etc/s6-rc: $(VM_S6_RC_FILES)
 	mkdir -p $$(dirname $@)
diff --git a/img/app/default.nix b/img/app/default.nix
index a196205..32ddb67 100644
--- a/img/app/default.nix
+++ b/img/app/default.nix
@@ -8,7 +8,7 @@ pkgsStatic.callPackage (
 { lib, stdenvNoCC, runCommand, writeClosure
 , erofs-utils, jq, s6-rc, util-linux
 , busybox, cacert, dejavu_fonts, execline, kmod, linux_latest, mdevd, s6
-, s6-linux-init, xdg-desktop-portal-spectrum,
+, s6-linux-init, xdg-desktop-portal-spectrum
 }:
 
 let
@@ -48,6 +48,9 @@ let
       pkgs.xwayland
       pkgs.xdg-desktop-portal
       pkgs.xdg-desktop-portal-gtk
+      # Depends on pulseaudio libs
+      pkgs.pipewire
+      pkgs.wireplumber
     ];
   })).fhsenv;
 in
diff --git a/img/app/etc/fstab b/img/app/etc/fstab
index a95088b..40aa3bd 100644
--- a/img/app/etc/fstab
+++ b/img/app/etc/fstab
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: CC0-1.0
 # SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is>
 proc		/proc		proc	defaults			0	0
-devpts		/dev/pts	devpts	defaults,gid=4,mode=620	0	0
+devpts		/dev/pts	devpts	defaults,gid=4,mode=620		0	0
 tmpfs		/dev/shm	tmpfs	defaults			0	0
 sysfs		/sys		sysfs	defaults			0	0
-tmpfs		/tmp		tmpfs	defaults			0	0
+tmpfs		/tmp		tmpfs	defaults,mode=1755		0	0
+tmpfs		/run		tmpfs	defaults			0	0
diff --git a/img/app/etc/s6-rc/app/dependencies.d/wireplumber b/img/app/etc/s6-rc/app/dependencies.d/wireplumber
new file mode 100644
index 0000000..e69de29
diff --git a/img/app/etc/s6-rc/app/dependencies.d/wireplumber.license b/img/app/etc/s6-rc/app/dependencies.d/wireplumber.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/app/dependencies.d/wireplumber.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/directories/type b/img/app/etc/s6-rc/directories/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/img/app/etc/s6-rc/directories/type
@@ -0,0 +1 @@
+oneshot
diff --git a/img/app/etc/s6-rc/directories/type.license b/img/app/etc/s6-rc/directories/type.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/directories/type.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/directories/up b/img/app/etc/s6-rc/directories/up
new file mode 100644
index 0000000..2396fad
--- /dev/null
+++ b/img/app/etc/s6-rc/directories/up
@@ -0,0 +1,11 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
+#
+# Directory creation (if it's copyrightable):
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2022 Unikie
+
+if { mkdir -m 1755 /tmp/.X11-unix }
+if { mkdir -m 0755 /run/user }
+if { mkdir -m 0700 /run/user/0 }
diff --git a/img/app/etc/s6-rc/pipewire/dependencies.d/directories b/img/app/etc/s6-rc/pipewire/dependencies.d/directories
new file mode 100644
index 0000000..e69de29
diff --git a/img/app/etc/s6-rc/pipewire/dependencies.d/directories.license b/img/app/etc/s6-rc/pipewire/dependencies.d/directories.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/dependencies.d/directories.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/pipewire/notification-fd b/img/app/etc/s6-rc/pipewire/notification-fd
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/notification-fd
@@ -0,0 +1 @@
+5
diff --git a/img/app/etc/s6-rc/pipewire/notification-fd.license b/img/app/etc/s6-rc/pipewire/notification-fd.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/notification-fd.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/pipewire/run b/img/app/etc/s6-rc/pipewire/run
new file mode 100644
index 0000000..c0b55a1
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/run
@@ -0,0 +1,20 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
+
+s6-ipcserver-socketbinder -B /run/user/0/pipewire-0
+fdmove -c 3 0
+
+s6-ipcserver-socketbinder -B /run/user/0/pipewire-0-manager
+fdmove -c 4 0
+
+redirfd -r 0 /dev/null
+
+# Notify readiness.
+if { fdmove 1 5 echo }
+fdclose 5
+
+export LISTEN_FDS 2
+getpid LISTEN_PID
+pipewire
diff --git a/img/app/etc/s6-rc/pipewire/type b/img/app/etc/s6-rc/pipewire/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/type
@@ -0,0 +1 @@
+longrun
diff --git a/img/app/etc/s6-rc/pipewire/type.license b/img/app/etc/s6-rc/pipewire/type.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/pipewire/type.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories b/img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories
new file mode 100644
index 0000000..e69de29
diff --git a/img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories.license b/img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/wayland-proxy-virtwl/dependencies.d/directories.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/wayland-proxy-virtwl/run b/img/app/etc/s6-rc/wayland-proxy-virtwl/run
index 7b80343..c1e0e08 100755
--- a/img/app/etc/s6-rc/wayland-proxy-virtwl/run
+++ b/img/app/etc/s6-rc/wayland-proxy-virtwl/run
@@ -1,17 +1,6 @@
 #!/bin/execlineb -P
 # SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
-#
-# Directory creation (if it's copyrightable):
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2022 Unikie
-
-foreground { mkdir /tmp/.X11-unix }
-foreground { mkdir /run/user }
-foreground {
-  umask 077
-  mkdir /run/user/0
-}
 
 s6-ipcserver-socketbinder -B /run/user/0/wayland-0
 fdmove -c 3 0
diff --git a/img/app/etc/s6-rc/wireplumber/dependencies.d/dbus b/img/app/etc/s6-rc/wireplumber/dependencies.d/dbus
new file mode 100644
index 0000000..e69de29
diff --git a/img/app/etc/s6-rc/wireplumber/dependencies.d/dbus.license b/img/app/etc/s6-rc/wireplumber/dependencies.d/dbus.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/wireplumber/dependencies.d/dbus.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire b/img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire
new file mode 100644
index 0000000..e69de29
diff --git a/img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire.license b/img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/wireplumber/dependencies.d/pipewire.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
diff --git a/img/app/etc/s6-rc/wireplumber/run b/img/app/etc/s6-rc/wireplumber/run
new file mode 100644
index 0000000..e721d8d
--- /dev/null
+++ b/img/app/etc/s6-rc/wireplumber/run
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>
+wireplumber
diff --git a/img/app/etc/s6-rc/wireplumber/type b/img/app/etc/s6-rc/wireplumber/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/img/app/etc/s6-rc/wireplumber/type
@@ -0,0 +1 @@
+longrun
diff --git a/img/app/etc/s6-rc/wireplumber/type.license b/img/app/etc/s6-rc/wireplumber/type.license
new file mode 100644
index 0000000..c4a0586
--- /dev/null
+++ b/img/app/etc/s6-rc/wireplumber/type.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2025 Demi Marie Obenour <demiobenour@gmail.com>

base-commit: 979bd3090215048fc6815abb2189b4d1809c98ef
-- 
Sincerely,
Demi Marie Obenour (she/her/hers)

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2025-07-04  2:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-04  2:13 [PATCH] Run PipeWire and WirePlumber in the VMs Demi Marie Obenour

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).