diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix deleted file mode 100644 index 137c46343775..000000000000 --- a/pkgs/applications/audio/music-player/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, darwin -, fetchFromGitHub -, pkg-config -, protobuf -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "music-player"; - version = "0.2.0-alpha.14"; - - src = fetchFromGitHub { - owner = "tsirysndr"; - repo = "music-player"; - rev = "v${version}"; - hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0="; - }; - - cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc="; - - nativeBuildInputs = [ - protobuf - rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; - - meta = with lib; { - description = "Extensible music player daemon written in Rust"; - homepage = "https://github.com/tsirysndr/music-player"; - changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "music-player"; - }; -} diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix new file mode 100644 index 000000000000..776486e6928c --- /dev/null +++ b/pkgs/by-name/mu/music-player/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + alsa-lib, + darwin, + fetchFromGitHub, + pkg-config, + protobuf, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "music-player"; + version = "0.2.0-alpha.14-unstable-2024-08-24"; + + src = fetchFromGitHub { + owner = "tsirysndr"; + repo = "music-player"; + # No patch for 0.2.0, diff patch has a big size, temporarily until the next release + rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d"; + hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM="; + }; + + cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; + + nativeBuildInputs = + [ + protobuf + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; + + meta = with lib; { + description = "Extensible music player daemon written in Rust"; + homepage = "https://github.com/tsirysndr/music-player"; + changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "music-player"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69ca4d78f5b..e3d4bc99d2f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32000,8 +32000,6 @@ with pkgs; musescore = qt6.callPackage ../applications/audio/musescore { }; - music-player = callPackage ../applications/audio/music-player { }; - mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { };