wireplumber: 0.4.17 -> 0.5.0
This commit is contained in:
parent
fccb6b42c3
commit
823897dde8
|
@ -56,24 +56,28 @@ in
|
||||||
|
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
pwNotForAudioConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-pw-not-for-audio.lua" ''
|
pwNotForAudioConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-no-audio.conf" ''
|
||||||
-- PipeWire is not used for audio, so prevent it from grabbing audio devices
|
# PipeWire is not used for audio, so WirePlumber should not be handling it
|
||||||
alsa_monitor.enable = function() end
|
wireplumber.profiles = {
|
||||||
|
main = {
|
||||||
|
hardware.audio = disabled
|
||||||
|
hardware.bluetooth = disabled
|
||||||
|
}
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-systemwide.lua" ''
|
|
||||||
-- When running system-wide, these settings need to be disabled (they
|
systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" ''
|
||||||
-- use functions that aren't available on the system dbus).
|
# When running system-wide, we don't have logind to call ReserveDevice
|
||||||
alsa_monitor.properties["alsa.reserve"] = false
|
wireplumber.profiles = {
|
||||||
default_access.properties["enable-flatpak-portal"] = false
|
main = {
|
||||||
'';
|
support.reserve-device = disabled
|
||||||
systemwideBluetoothConfigPkg = pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/80-systemwide.lua" ''
|
}
|
||||||
-- When running system-wide, logind-integration needs to be disabled.
|
}
|
||||||
bluez_monitor.properties["with-logind"] = false
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configPackages = cfg.configPackages
|
configPackages = cfg.configPackages
|
||||||
++ lib.optional (!pwUsedForAudio) pwNotForAudioConfigPkg
|
++ lib.optional (!pwUsedForAudio) pwNotForAudioConfigPkg
|
||||||
++ lib.optionals config.services.pipewire.systemWide [ systemwideConfigPkg systemwideBluetoothConfigPkg ];
|
++ lib.optional config.services.pipewire.systemWide systemwideConfigPkg;
|
||||||
|
|
||||||
configs = pkgs.buildEnv {
|
configs = pkgs.buildEnv {
|
||||||
name = "wireplumber-configs";
|
name = "wireplumber-configs";
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wireplumber";
|
pname = "wireplumber";
|
||||||
version = "0.4.17";
|
version = "0.5.0";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
|
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "pipewire";
|
owner = "pipewire";
|
||||||
repo = "wireplumber";
|
repo = "wireplumber";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
|
hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Loading…
Reference in New Issue
Block a user