From 8764841759382651691620c7c4ba607e02036b98 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Mon, 9 Dec 2024 21:21:17 +0100
Subject: [PATCH] shairport-sync: use airplay2 variant instead of custome
 overlay

---
 flake.nix                                 | 11 -----------
 modules/services/audio/shairport-sync.nix |  1 +
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9e66803..dd85023 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,15 +35,6 @@
       system = "x86_64-linux";
     in
     {
-      overlays = {
-        shairportSyncAirplay2 = final: prev: {
-          shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: {
-            # See: https://github.com/mikebrady/shairport-sync/blob/e78a88b64adfe7b5f88fd6faedf55c57445bb240/CONFIGURATION%20FLAGS.md
-            configureFlags = previousAttr.configureFlags ++ [ "--with-mqtt-client" ];
-            buildInputs = previousAttr.buildInputs ++ [ final.mosquitto ];
-          });
-        };
-      };
       nixosModules = {
         common = ./config/common;
         proxmox-vm = ./config/proxmox-vm;
@@ -55,7 +46,6 @@
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
-            { nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
             ./config/hosts/audio-hauptraum-kueche
           ];
         };
@@ -65,7 +55,6 @@
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
-            { nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
             ./config/hosts/audio-hauptraum-tafel
           ];
         };
diff --git a/modules/services/audio/shairport-sync.nix b/modules/services/audio/shairport-sync.nix
index cbc58e7..43d1285 100644
--- a/modules/services/audio/shairport-sync.nix
+++ b/modules/services/audio/shairport-sync.nix
@@ -17,6 +17,7 @@ in
   config = mkIf cfg.enable {
     services.shairport-sync = {
       enable = true;
+      package = pkgs.shairport-sync-airplay2;
       arguments = "-o pw -v";
     };