aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmd/hpkg
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-12-08 08:03:50 +0900
committerOphestra <cat@gensokyo.uk>2025-12-08 08:53:04 +0900
commit87781c765844409226804157546753b84ef3c6b4 (patch)
tree4fa7bdbe890979badada6c36183a2ff25b7b85a8 /cmd/hpkg
parent0c38fb7b6a17bed9392a4cf46fc752bc2de8eb18 (diff)
treewide: include PipeWire op and enforce PulseAudio check
This fully replaces PulseAudio with PipeWire and enforces the PulseAudio check and error message. The pipewire-pulse daemon is handled in the NixOS module. Closes #26. Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/hpkg')
-rw-r--r--cmd/hpkg/build.nix1
-rw-r--r--cmd/hpkg/test/test.py8
2 files changed, 4 insertions, 5 deletions
diff --git a/cmd/hpkg/build.nix b/cmd/hpkg/build.nix
index 5e2f55ac..d994fc2d 100644
--- a/cmd/hpkg/build.nix
+++ b/cmd/hpkg/build.nix
@@ -176,7 +176,6 @@ let
x11 = allow_x11;
dbus = allow_dbus;
pipewire = allow_audio;
- pulse = allow_audio;
};
mesa = if gpu then mesaWrappers else null;
diff --git a/cmd/hpkg/test/test.py b/cmd/hpkg/test/test.py
index ef6a626f..81e02814 100644
--- a/cmd/hpkg/test/test.py
+++ b/cmd/hpkg/test/test.py
@@ -90,13 +90,13 @@ wait_for_window("hakurei@machine-foot")
machine.send_chars("clear; wayland-info && touch /tmp/success-client\n")
machine.wait_for_file("/tmp/hakurei.0/tmpdir/2/success-client")
collect_state_ui("app_wayland")
-check_state("foot", {"wayland": True, "dbus": True, "pipewire": True, "pulse": True})
+check_state("foot", {"wayland": True, "dbus": True, "pipewire": True})
# Verify acl on XDG_RUNTIME_DIR:
-print(machine.succeed("getfacl --absolute-names --omit-header --numeric /run/user/1000 | grep 10002"))
+print(machine.succeed("getfacl --absolute-names --omit-header --numeric /tmp/hakurei.0/runtime | grep 10002"))
machine.send_chars("exit\n")
machine.wait_until_fails("pgrep foot")
# Verify acl cleanup on XDG_RUNTIME_DIR:
-machine.wait_until_fails("getfacl --absolute-names --omit-header --numeric /run/user/1000 | grep 10002")
+machine.wait_until_fails("getfacl --absolute-names --omit-header --numeric /tmp/hakurei.0/runtime | grep 10002")
# Exit Sway and verify process exit status 0:
swaymsg("exit", succeed=False)
@@ -107,4 +107,4 @@ print(machine.succeed("find /tmp/hakurei.0 "
+ "-path '/tmp/hakurei.0/runtime/*/*' -prune -o "
+ "-path '/tmp/hakurei.0/tmpdir/*/*' -prune -o "
+ "-print"))
-print(machine.succeed("find /run/user/1000/hakurei"))
+print(machine.fail("ls /run/user/1000/hakurei"))