From 049a4670b25fac3eaebd053707a7ec9fcd86adfe Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 5 Aug 2025 13:40:16 +0300
Subject: [PATCH] mpd: promote features list to top level arguments

From some reason, using mpdWithFeature = mpd.override inside
mpd/default.nix causes an evaluation error
---
 pkgs/by-name/mp/mpd-small/package.nix |  4 ++--
 pkgs/servers/mpd/default.nix          | 13 ++++---------
 pkgs/top-level/aliases.nix            |  1 +
 pkgs/top-level/all-packages.nix       |  1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/mp/mpd-small/package.nix b/pkgs/by-name/mp/mpd-small/package.nix
index f1f71daf0de1..441beb7bba8d 100644
--- a/pkgs/by-name/mp/mpd-small/package.nix
+++ b/pkgs/by-name/mp/mpd-small/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
-  mpdWithFeatures,
+  mpd,
 }:
 
-mpdWithFeatures {
+mpd.override {
   features = [
     "webdav"
     "curl"
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e978ff994965..5cea63610e76 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -65,6 +65,8 @@
   # For tests
   gtest,
   zip,
+  # Features list
+  features ? null,
 }:
 
 let
@@ -152,11 +154,6 @@ let
     ];
   };
 
-  run =
-    {
-      features ? null,
-    }:
-    let
       # Disable platform specific features if needed
       # using libmad to decode mp3 files on darwin is causing a segfault -- there
       # is probably a solution, but I'm disabling it for now
@@ -197,8 +194,7 @@ let
             else
               features;
 
-    in
-    stdenv.mkDerivation (finalAttrs: {
+  mpd = stdenv.mkDerivation (finalAttrs: {
       pname = "mpd";
       version = "0.24.5";
 
@@ -292,6 +288,5 @@ let
     });
 in
 {
-  mpd = run { };
-  mpdWithFeatures = run;
+  inherit mpd;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ab98e192fe04..34fc4540c7e4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1333,6 +1333,7 @@ mapAliases {
   mpc-cli = mpc; # Added 2024-10-14
   mpc_cli = mpc; # Added 2024-10-14
   mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17
+  mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpdevil = plattenalbum; # Added 2024-05-22
   mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
   mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eabe9e214c4..88a254db5f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10224,7 +10224,6 @@ with pkgs;
     (callPackages ../servers/mpd {
     })
     mpd
-    mpdWithFeatures
     ;
 
   mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };