From 84c51bef56a6ca94a15b1ef672bf7b6f17793a6a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 20:57:18 +0300 Subject: [PATCH 1/2] wireplumber: 0.5.5 -> 0.5.6 Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.5...0.5.6 --- pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 607565b8fe69..ae4656a2f666 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-evqQCKf4oE/PwkAOMPPPw8LPiNIWQ2gkOJzsFC8UN+k="; + hash = "sha256-UAx7laULICb9ClZsIFcKi687M0yEgV4sCyhKqxs4nHE="; }; nativeBuildInputs = [ From a0134dd1d8c2cf71ef8d10b7566ccbeb39e81d84 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 20:58:12 +0300 Subject: [PATCH 2/2] nixos/wireplumber: drop hack for systemwide setups Should not be necessary with 0.5.6. --- .../services/desktops/pipewire/wireplumber.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index c924801bcd8b..cccb892cecf7 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -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";