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

Merge pull request #291946 from hcsch/pipewire-wireplumber-config-packages-migration 

nixos/pipewire: add assertions for migration to `extraConfig`/`configPackages`
parents c955a451 5f6dca84

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

+12 −0
Original line number Diff line number Diff line
@@ -293,6 +293,18 @@ in { 
        assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable;

        message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true.";

      }

      {

        assertion = builtins.length

          (builtins.attrNames

            (

              lib.filterAttrs

                (name: value:

                  lib.hasPrefix "pipewire/" name || name == "pipewire"

                )

                config.environment.etc

            )) == 1;

        message = "Using `environment.etc.\"pipewire<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` instead.";

      }

    ];



    environment.systemPackages = [ cfg.package ]

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

+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,18 @@ in 
          assertion = !config.hardware.bluetooth.hsphfpd.enable;

          message = "Using WirePlumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false";

        }

        {

          assertion = builtins.length

            (builtins.attrNames

              (

                lib.filterAttrs

                  (name: value:

                    lib.hasPrefix "wireplumber/" name || name == "wireplumber"

                  )

                  config.environment.etc

              )) == 1;

          message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.wireplumber.configPackages` instead.";

        }

      ];



      environment.systemPackages = [ cfg.package ];