@@ -870,6 +870,10 @@ in
870870
871871 avahi = callPackage ../development/libraries/avahi (config.avahi or {});
872872
873+ avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
874+ withLibdnssdCompat = true;
875+ });
876+
873877 avro-c = callPackage ../development/libraries/avro-c { };
874878
875879 avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
@@ -14149,7 +14153,7 @@ in
1414914153
1415014154 sambaFull = samba4Full;
1415114155
14152− shairplay = callPackage ../servers/shairplay { };
14156+ shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
1415314157
1415414158 shairport-sync = callPackage ../servers/shairport-sync { };
1415514159
@@ -18503,9 +18507,7 @@ in
1850318507 multimon-ng = callPackage ../applications/radio/multimon-ng { };
1850418508
1850518509 inherit (callPackages ../applications/networking/mumble {
18506− avahi = avahi.override {
18507− withLibdnssdCompat = true;
18508− };
18510+ avahi = avahi-compat;
1850918511 jackSupport = config.mumble.jackSupport or false;
1851018512 speechdSupport = config.mumble.speechdSupport or false;
1851118513 pulseSupport = config.pulseaudio or false;
@@ -18513,9 +18515,7 @@ in
1851318515 }) mumble mumble_git murmur;
1851418516
1851518517 inherit (callPackages ../applications/networking/mumble {
18516− avahi = avahi.override {
18517− withLibdnssdCompat = true;
18518− };
18518+ avahi = avahi-compat;
1851918519 jackSupport = config.mumble.jackSupport or false;
1852018520 speechdSupport = config.mumble.speechdSupport or false;
1852118521 pulseSupport = config.pulseaudio or false;