Unverified Commit 6e871d6b authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

shairport-sync: use new names of pipewire and pulseaudio backends (#497238)

parents b7997ad9 33b4d77b

nixos/modules/services/networking/shairport-sync.nix

+13 −3
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ in 
      settings = mkOption {

        type = configFormat.type;

        default = {

          general.output_backend = "pa";

          general.output_backend = "pulseaudio";

          diagnostics.log_verbosity = 1;

        };

        example = {

          general = {

            name = "NixOS Shairport";

            output_backend = "pw";

            output_backend = "pipewire";

          };

          metadata = {

            enabled = "yes";
@@ -112,13 +112,23 @@ in 
  ###### implementation



  config = mkIf config.services.shairport-sync.enable {

    assertions = [

      {

        assertion = config.services.shairport-sync.settings.general.output_backend or null != "pw";

        message = "shairport-sync 5.0 renamed the pipewire backend from 'pw' to 'pipewire'";

      }

      {

        assertion = config.services.shairport-sync.settings.general.output_backend or null != "pa";

        message = "shairport-sync 5.0 renamed the pulseaudio backend from 'pa' to 'pulseaudio'";

      }

    ];



    services.avahi.enable = true;

    services.avahi.publish.enable = true;

    services.avahi.publish.userServices = true;



    services.shairport-sync.settings = {

      general.output_backend = lib.mkDefault "pa";

      general.output_backend = lib.mkDefault "pulseaudio";

      diagnostics.log_verbosity = lib.mkDefault 1;

    };

pkgs/by-name/sh/shairport-sync/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: { 
    "--with-ssl=openssl"

  ]

  ++ optional enableAvahi "--with-avahi"

  ++ optional enablePulse "--with-pa"

  ++ optional enablePipewire "--with-pw"

  ++ optional enablePulse "--with-pulseaudio"

  ++ optional enablePipewire "--with-pipewire"

  ++ optional enableAlsa "--with-alsa"

  ++ optional enableSndio "--with-sndio"

  ++ optional enableAo "--with-ao"