From 587d06f7e043b165c33bce89f5f01992c9793c18 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 5 Aug 2025 13:43:51 +0300
Subject: [PATCH] mpd: define simpler, using callPackage (singular)

---
 pkgs/servers/mpd/default.nix    | 9 +++------
 pkgs/top-level/all-packages.nix | 6 +-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 5cea63610e76..67752682ca8a 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -194,7 +194,8 @@ let
             else
               features;
 
-  mpd = stdenv.mkDerivation (finalAttrs: {
+in
+  stdenv.mkDerivation (finalAttrs: {
       pname = "mpd";
       version = "0.24.5";
 
@@ -285,8 +286,4 @@ let
           files while being controlled by its network protocol.
         '';
       };
-    });
-in
-{
-  inherit mpd;
-}
+    })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88a254db5f05..18a08f3ff2ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10220,11 +10220,7 @@ with pkgs;
 
   mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
 
-  inherit
-    (callPackages ../servers/mpd {
-    })
-    mpd
-    ;
+  mpd = callPackage ../servers/mpd { };
 
   mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };