summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reiss <dnr@dnr.im>2022-06-18 18:33:28 -0700
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-06-20 19:08:47 +0200
commit44b7a871b160a7154404d749830a1fc963f29b6f (patch)
treefee8c87666c00ec5f811f6b7f05ae74ca1389930
parentclang-tools: provide many versions (diff)
downloadnixpkgs-44b7a871b160a7154404d749830a1fc963f29b6f.tar.gz
nixos/pipewire: fix wireplumber with system-wide
(cherry picked from commit 33163bd0ef1a2c3338c9f55471609d8b93f806fc)
-rw-r--r--nixos/modules/services/desktops/pipewire/wireplumber.nix15
1 files changed, 14 insertions, 1 deletions
diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix
index 1dbdd842c4a1..439a3ae68daa 100644
--- a/nixos/modules/services/desktops/pipewire/wireplumber.nix
+++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix
@@ -37,11 +37,19 @@ in
environment.systemPackages = [ cfg.package ];
environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) {
- text = ''
+ text = ''
-- Pipewire is not used for audio, so prevent it from grabbing audio devices
alsa_monitor.enable = function() end
'';
};
+ environment.etc."wireplumber/main.lua.d/80-systemwide.lua" = lib.mkIf config.services.pipewire.systemWide {
+ text = ''
+ -- When running system-wide, these settings need to be disabled (they
+ -- use functions that aren't available on the system dbus).
+ alsa_monitor.properties["alsa.reserve"] = false
+ default_access.properties["enable-flatpak-portal"] = false
+ '';
+ };
systemd.packages = [ cfg.package ];
@@ -50,5 +58,10 @@ in
systemd.services.wireplumber.wantedBy = [ "pipewire.service" ];
systemd.user.services.wireplumber.wantedBy = [ "pipewire.service" ];
+
+ systemd.services.wireplumber.environment = lib.mkIf config.services.pipewire.systemWide {
+ # Force wireplumber to use system dbus.
+ DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket";
+ };
};
}