diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/by-name/sh/shairplay/package.nix
similarity index 82%
rename from pkgs/servers/shairplay/default.nix
rename to pkgs/by-name/sh/shairplay/package.nix
index d7eb009476ac..560bf9964fe1 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/by-name/sh/shairplay/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  avahi,
+  avahi-compat,
   libao,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "shairplay-unstable";
   version = "2018-08-24";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    avahi
+    avahi-compat
     libao
   ];
 
@@ -34,16 +34,16 @@ stdenv.mkDerivation rec {
   # the build will fail without complaining about a reference to /tmp
   preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     patchelf \
-      --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \
+      --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib" \
       $out/bin/shairplay
   '';
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "Apple AirPlay and RAOP protocol server";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ peterhoeg ];
     platforms = lib.platforms.unix;
     mainProgram = "shairplay";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2331737d0c8e..94776452030a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8686,8 +8686,6 @@ with pkgs;
 
   scalene = with python3Packages; toPythonApplication scalene;
 
-  shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
-
   shairport-sync-airplay2 = shairport-sync.override {
     enableAirplay2 = true;
   };