From aea76f1e29b8f1b47547c27dfd29fe6d1751854d Mon Sep 17 00:00:00 2001
From: miranda <miranda@pulusound.fi>
Date: Thu, 13 Feb 2025 03:10:52 +0200
Subject: [PATCH 1/2] mpd: add libao output

---
 pkgs/servers/mpd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 3ec05f243fa9..e16dbd43fc14 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -38,6 +38,7 @@
   soxr,
   # Outputs
   alsa-lib,
+  libao,
   libjack2,
   libpulseaudio,
   libshout,
@@ -112,6 +113,7 @@ let
     soxr = [ soxr ];
     # Output plugins
     alsa = [ alsa-lib ];
+    ao = [ libao ];
     jack = [ libjack2 ];
     pipewire = [ pipewire ];
     pulse = [ libpulseaudio ];

From 8895b89d29ce27dd88b166ec1b851ab7b85f0459 Mon Sep 17 00:00:00 2001
From: miranda <miranda@pulusound.fi>
Date: Thu, 13 Feb 2025 03:11:40 +0200
Subject: [PATCH 2/2] mpd: use bonjour for zeroconf on darwin

---
 pkgs/servers/mpd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e16dbd43fc14..28b9e2b5cbaa 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -264,7 +264,9 @@ let
         ]
         ++ map (x: "-D${x}=enabled") features_
         ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
-        ++ lib.optional (builtins.elem "zeroconf" features_) "-Dzeroconf=avahi"
+        ++ lib.optional (builtins.elem "zeroconf" features_) (
+          "-Dzeroconf=" + (if stdenv.hostPlatform.isDarwin then "bonjour" else "avahi")
+        )
         ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"
         ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";