diff --git a/pkgs/by-name/rm/rmpc/Cargo.lock.patch b/pkgs/by-name/rm/rmpc/Cargo.lock.patch deleted file mode 100644 index 404baea3e165..000000000000 --- a/pkgs/by-name/rm/rmpc/Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e4e2d1a..72839b4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -198,9 +198,9 @@ dependencies = [ - - [[package]] - name = "bitstream-io" --version = "2.5.0" -+version = "2.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" -+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" - - [[package]] - name = "built" -@@ -1376,9 +1376,9 @@ dependencies = [ - - [[package]] - name = "ravif" --version = "0.11.8" -+version = "0.11.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" -+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" - dependencies = [ - "avif-serialize", - "imgref", diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 4ac072cb81c7..6efe7b07a43a 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -2,44 +2,41 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, + installShellFiles, pkg-config, cmake, }: rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "v${version}"; - hash = "sha256-g+yzW0DfaBhJKTikYZ8eqe4pX8nJvbpJ1xaZ3W/O/bo="; + hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI="; }; - cargoHash = "sha256-wFrHgB4wYGeXvfdGf4SJAAL8fE6dAKDLL51Ohmn+1HQ="; - - cargoPatches = [ - # Patch Cargo.lock to make rmpc compile with older versions of rustc - # Remove when Rust 1.79.0 is in master - ./Cargo.lock.patch - ]; - - patches = [ - # Fix release mode tests compilation issues - # Remove when next rmpc version comes out - (fetchpatch { - url = "https://github.com/mierak/rmpc/commit/f12be6f606f5319523f41576e7c463b6008b9069.patch"; - hash = "sha256-4L/MrdC/ydTqnkt3qd5H8hLZimiqct6sOkEq8rJN0F4="; - }) - ]; + cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng="; nativeBuildInputs = [ + installShellFiles pkg-config cmake ]; + env.VERGEN_GIT_DESCRIBE = version; + + postInstall = '' + installManPage target/man/rmpc.1 + + installShellCompletion --cmd rmpc \ + --bash target/completions/rmpc.bash \ + --fish target/completions/rmpc.fish \ + --zsh target/completions/_rmpc + ''; + meta = { changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}"; description = "TUI music player client for MPD with album art support via kitty image protocol"; @@ -53,5 +50,6 @@ rustPlatform.buildRustPackage rec { ''; maintainers = with lib.maintainers; [ donovanglover ]; mainProgram = "rmpc"; + platforms = lib.platforms.linux; }; }