colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/pipewire: introduce an explicit option to use Pipewire as audio server

Browse Source
This commit is contained in:
K900 2022-03-22 14:15:16 +03:00
parent 1dbc26d995
commit 435a5b675b
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
View File

@ -110,6 +110,11 @@ in {
source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor; source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor;
}; };
environment.etc."pipewire/media-session.d/with-audio" =
mkIf config.services.pipewire.audio.enable {
text = "";
};
environment.etc."pipewire/media-session.d/with-alsa" = environment.etc."pipewire/media-session.d/with-alsa" =
mkIf config.services.pipewire.alsa.enable { mkIf config.services.pipewire.alsa.enable {
text = ""; text = "";

21
nixos/modules/services/desktops/pipewire/pipewire.nix
View File

@ -39,8 +39,6 @@ let
pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire; pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire;
pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse;
}; };
usedForAudio = cfg.pulse.enable || cfg.alsa.enable || cfg.jack.enable;
in { in {
meta = { meta = {
@ -118,6 +116,16 @@ in {
}; };
}; };
audio = {
enable = lib.mkOption {
type = lib.types.bool;
# this is for backwards compatibility
default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable;
defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable";
description = "Whether to use PipeWire as the primary sound server";
};
};
alsa = { alsa = {
enable = mkEnableOption "ALSA support"; enable = mkEnableOption "ALSA support";
support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems";
@ -154,13 +162,18 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [
{ {
assertion = usedForAudio -> !config.hardware.pulseaudio.enable; assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable;
message = "Using PipeWire as a sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
} }
{ {
assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; assertion = cfg.jack.enable -> !config.services.jack.jackd.enable;
message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false";
} }
{
# JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want
assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable;
message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true.";
}
]; ];
environment.systemPackages = [ cfg.package ] environment.systemPackages = [ cfg.package ]

12
nixos/modules/services/desktops/pipewire/wireplumber.nix
View File

@ -3,7 +3,7 @@
let let
pwCfg = config.services.pipewire; pwCfg = config.services.pipewire;
cfg = pwCfg.wireplumber; cfg = pwCfg.wireplumber;
pwUsedForAudio = pwCfg.pulse.enable || pwCfg.alsa.enable || pwCfg.jack.enable; pwUsedForAudio = pwCfg.audio.enable;
in in
{ {
meta.maintainers = [ lib.maintainers.k900 ]; meta.maintainers = [ lib.maintainers.k900 ];
@ -36,10 +36,12 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
environment.etc.wireplumber."main.lua.d"."80-nixos.lua".text = if !pwUsedForAudio then '' environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) {
# Pipewire is not used for audio, so prevent it from grabbing audio devices text = ''
alsa_monitor.enable = function() end # Pipewire is not used for audio, so prevent it from grabbing audio devices
'' else ""; alsa_monitor.enable = function() end
'';
};
systemd.packages = [ cfg.package ]; systemd.packages = [ cfg.package ];