diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix deleted file mode 100644 index c58c6831edf462f..000000000000000 --- a/pkgs/applications/audio/mpc/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, installShellFiles -, libiconv -, libmpdclient -, meson -, ninja -, pkg-config -, sphinx -}: - -stdenv.mkDerivation rec { - pname = "mpc"; - version = "0.34"; - - src = fetchFromGitHub { - owner = "MusicPlayerDaemon"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; - }; - - patches = [ - # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; - sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; - }) - ]; - - buildInputs = [ - libmpdclient - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - - nativeBuildInputs = [ - installShellFiles - meson - ninja - pkg-config - sphinx - ]; - - postInstall = '' - installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash - ''; - - postFixup = '' - rm $out/share/doc/mpc/contrib/mpc-completion.bash - ''; - - meta = with lib; { - homepage = "https://www.musicpd.org/clients/mpc/"; - description = "Minimalist command line interface to MPD"; - changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - mainProgram = "mpc"; - }; -} diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix new file mode 100644 index 000000000000000..2d1976123167022 --- /dev/null +++ b/pkgs/by-name/mp/mpc/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + installShellFiles, + libiconv, + libmpdclient, + meson, + ninja, + pkg-config, + python3Packages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mpc"; + version = "0.35"; + + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "mpc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-oVdnj3nsYvOHcIOgoamLamriuWu9lucWUQtxVmXZabs="; + }; + + buildInputs = [ + libmpdclient + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + nativeBuildInputs = [ + installShellFiles + meson + ninja + pkg-config + python3Packages.sphinx + ]; + + postInstall = '' + installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash + ''; + + postFixup = '' + rm $out/share/doc/mpc/contrib/mpc-completion.bash + ''; + + meta = { + homepage = "https://www.musicpd.org/clients/mpc/"; + description = "Minimalist command line interface to MPD"; + changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS"; + license = lib.licenses.gpl2Plus; + mainProgram = "mpc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8198b782e9a92b1..0f1f3cb7a38ec5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31164,9 +31164,7 @@ with pkgs; withConplay = false; }; - mpc-cli = callPackage ../applications/audio/mpc { - inherit (python3Packages) sphinx; - }; + mpc-cli = mpc; clerk = callPackage ../applications/audio/clerk { };