refactor(pkgs/mpc): Rename to `mpp`

Nixpkgs has renamed their `mpc-cli` package to just `mpc`, turning this
`mpc` package into an override for the official nixpkgs one. I think
being explicit about the fact, that `mpc` is wrapped is the best
solution here.

5 files changed, 6 insertions, 21 deletions

diff --git a/pkgs/by-name/mp/mpc-beetrm/package.nix b/pkgs/by-name/mp/mpc-beetrm/package.nix
index 837c93e2..99ca8bbd 100644
--- a/pkgs/by-name/mp/mpc-beetrm/package.nix
+++ b/pkgs/by-name/mp/mpc-beetrm/package.nix
@@ -1,6 +1,6 @@
 {
   sysLib,
-  mpc-cli,
+  mpc,
   beets,
 }:
 sysLib.writeShellScript {
@@ -10,7 +10,7 @@ sysLib.writeShellScript {
   keepPath = false;
 
   dependencies = [
-    mpc-cli
+    mpc
     beets
   ];
 }
diff --git a/pkgs/by-name/mp/mpc-lyrics/package.nix b/pkgs/by-name/mp/mpc-lyrics/package.nix
index fdb8c53a..08cc8e48 100644
--- a/pkgs/by-name/mp/mpc-lyrics/package.nix
+++ b/pkgs/by-name/mp/mpc-lyrics/package.nix
@@ -1,7 +1,7 @@
 {
   sysLib,
   exiftool,
-  mpc-cli,
+  mpc,
   jq,
   less,
   locale, # dependency of less
@@ -19,7 +19,7 @@ sysLib.writeShellScript {
 
   dependencies = [
     exiftool
-    mpc-cli
+    mpc
     jq
     less
     locale # dependency of less
diff --git a/pkgs/by-name/mp/mpc-searchadd/package.nix b/pkgs/by-name/mp/mpc-searchadd/package.nix
index 54ceca91..fd9f94e6 100644
--- a/pkgs/by-name/mp/mpc-searchadd/package.nix
+++ b/pkgs/by-name/mp/mpc-searchadd/package.nix
@@ -1,6 +1,6 @@
 {
   sysLib,
-  mpc-cli,
+  mpc,
   beets,
 }:
 sysLib.writeShellScript {
@@ -10,7 +10,7 @@ sysLib.writeShellScript {
   keepPath = false;
 
   dependencies = [
-    mpc-cli
+    mpc
     beets
   ];
 }
diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix
deleted file mode 100644
index d73c0523..00000000
--- a/pkgs/by-name/mp/mpc/package.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  sysLib,
-  mpc-cli,
-}:
-sysLib.writeShellScript {
-  name = "mpc";
-  src = ./mpc.sh;
-  generateCompletions = 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-cli
-  ];
-}
diff --git a/pkgs/by-name/mp/mpc/mpc.sh b/pkgs/by-name/mp/mpp/mpp.sh
index 0d636ac5..0d636ac5 100755
--- a/pkgs/by-name/mp/mpc/mpc.sh
+++ b/pkgs/by-name/mp/mpp/mpp.sh