mpd: promote features list to top level arguments

From some reason, using mpdWithFeature = mpd.override inside
mpd/default.nix causes an evaluation error
This commit is contained in:
Doron Behar
2025-08-05 13:40:16 +03:00
parent 4ef8429671
commit 049a4670b2
4 changed files with 7 additions and 12 deletions
+2 -2
View File
@@ -1,10 +1,10 @@
{
lib,
stdenv,
mpdWithFeatures,
mpd,
}:
mpdWithFeatures {
mpd.override {
features = [
"webdav"
"curl"
+4 -9
View File
@@ -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;
}
+1
View File
@@ -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
-1
View File
@@ -10224,7 +10224,6 @@ with pkgs;
(callPackages ../servers/mpd {
})
mpd
mpdWithFeatures
;
mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };