c3d2/nix-user-module
c3d2
/
nix-user-module
23
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

audio: fix eval after recent pipewire module changes

This commit is contained in:
Sandro - 2023-03-28 00:00:44 +02:00
parent 183ed1766d
commit 2889ffe856
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/audio.nix
View File

@ -9,6 +9,14 @@ in
};
config = lib.mkIf cfg {
environment.etc = lib.optionalAttrs (lib.versionOlder lib.version "23.05") {
"pipewire/pipewire.conf.d/zeroconf".text = builtins.toJSON {
"context.modules" = [ {
"name" = "libpipewire-module-zeroconf-discover";
} ];
};
};
hardware.pulseaudio.zeroconf.discovery.enable = true;
security.rtkit.enable = true;
@ -19,20 +27,24 @@ in
nssmdns = true;
};
pipewire = {
config.pipewire-pulse =
let
default-pipewire-pulse = lib.importJSON (pkgs.path + "/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json");
in
default-pipewire-pulse // {
"context.modules" = default-pipewire-pulse."context.modules" ++ [
{
"name" = "libpipewire-module-zeroconf-discover";
}
];
};
pulse.enable = true;
};
pipewire = lib.mkMerge [
(lib.optionalAttrs (lib.versionAtLeast lib.version "23.05") {
config.pipewire-pulse =
let
default-pipewire-pulse = lib.importJSON (pkgs.path + "/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json");
in
default-pipewire-pulse // {
"context.modules" = default-pipewire-pulse."context.modules" ++ [
{
"name" = "libpipewire-module-zeroconf-discover";
}
];
};
})
{
pulse.enable = true;
}
];
};
};
}