fix(pkgs/mpc): Update the new music handling system

2 files changed, 11 insertions, 9 deletions

diff --git a/pkgs/by-name/mp/mpc/mpc.sh b/pkgs/by-name/mp/mpc/mpc.sh
index 5aae5cdb..f613cf0a 100755
--- a/pkgs/by-name/mp/mpc/mpc.sh
+++ b/pkgs/by-name/mp/mpc/mpc.sh
@@ -4,13 +4,17 @@
 SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH
 
 case "$1" in
-"rm")
+"searchadd")
     shift 1
-    mpc-rm "$@"
+    mpc-searchadd "$@"
+    ;;
+"lyrics")
+    shift 1
+    mpc-lyrics "$@"
     ;;
-"fav")
+"rm")
     shift 1
-    mpc-fav "$@"
+    mpc-rm "$@"
     ;;
 *)
     mpc "$@"
diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix
index 936aa990..d73c0523 100644
--- a/pkgs/by-name/mp/mpc/package.nix
+++ b/pkgs/by-name/mp/mpc/package.nix
@@ -1,17 +1,15 @@
 {
   sysLib,
-  mpc-fav,
-  mpc-rm,
   mpc-cli,
 }:
 sysLib.writeShellScript {
   name = "mpc";
   src = ./mpc.sh;
   generateCompletions = false;
-  keepPath = false;
+  # We source the wrappers from the environment, to ensure that they have the same
+  # configurations (e.g. MPD_MUSIC_DIR in `mpc-lyrics`)
+  keepPath = true;
   dependencies = [
-    mpc-fav
-    mpc-rm
     mpc-cli
   ];
 }