Unverified Commit 7cf4cfa8 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #278760 from K900/wireplumber-0.5 

wireplumber: 0.4.17 -> 0.5.0
parents 30b430c4 823897dd

nixos/modules/services/desktops/pipewire/wireplumber.nix

+17 −13
Original line number Diff line number Diff line
@@ -56,24 +56,28 @@ in 


  config =

    let

      pwNotForAudioConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-pw-not-for-audio.lua" ''

        -- PipeWire is not used for audio, so prevent it from grabbing audio devices

        alsa_monitor.enable = function() end

      '';

      systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-systemwide.lua" ''

        -- When running system-wide, these settings need to be disabled (they

        -- use functions that aren't available on the system dbus).

        alsa_monitor.properties["alsa.reserve"] = false

        default_access.properties["enable-flatpak-portal"] = false

      pwNotForAudioConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-no-audio.conf" ''

        # PipeWire is not used for audio, so WirePlumber should not be handling it

        wireplumber.profiles = {

          main = {

            hardware.audio = disabled

            hardware.bluetooth = 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



      systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" ''

        # When running system-wide, we don't have logind to call ReserveDevice

        wireplumber.profiles = {

          main = {

            support.reserve-device = disabled

          }

        }

      '';



      configPackages = cfg.configPackages

          ++ lib.optional (!pwUsedForAudio) pwNotForAudioConfigPkg

          ++ lib.optionals config.services.pipewire.systemWide [ systemwideConfigPkg systemwideBluetoothConfigPkg ];

          ++ lib.optional config.services.pipewire.systemWide systemwideConfigPkg;



      configs = pkgs.buildEnv {

        name = "wireplumber-configs";

pkgs/development/libraries/pipewire/wireplumber.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


stdenv.mkDerivation rec {

  pname = "wireplumber";

  version = "0.4.17";

  version = "0.5.0";



  outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec { 
    owner = "pipewire";

    repo = "wireplumber";

    rev = version;

    hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";

    hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY=";

  };



  nativeBuildInputs = [