1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00

nixos/wireplumber: drop hack for systemwide setups

Should not be necessary with 0.5.6.
This commit is contained in:
K900 2024-09-06 20:58:12 +03:00
parent 84c51bef56
commit a0134dd1d8

View file

@ -215,17 +215,6 @@ in
}
'';
systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" ''
# When running system-wide, we don't have logind to call ReserveDevice,
# And bluetooth logind integration needs to be disabled
wireplumber.profiles = {
main = {
support.reserve-device = disabled
monitor.bluez.seat-monitoring = disabled
}
}
'';
extraConfigPkg = pkgs.buildEnv {
name = "wireplumber-extra-config";
paths = mapConfigToFiles cfg.extraConfig;
@ -240,8 +229,7 @@ in
configPackages = cfg.configPackages
++ [ extraConfigPkg extraScriptsPkg ]
++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg
++ optional pwCfg.systemWide systemwideConfigPkg;
++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg;
configs = pkgs.buildEnv {
name = "wireplumber-configs";