From c5bfa2626e11067135681cfd150ea460eeda2830 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Tue, 27 Feb 2024 16:52:06 +0000 Subject: [PATCH] kord: fix build due to changed compiler features The rust feature `no_coverage` has been replaced by one called `coverage_attribute` (and respective `#[no_coverage]` declarations must now be annotated as `#[coverage(off)]`. Because of this, the build of `kord` fails on current versions of the Rust compiler. Upstream has already resolved these issues [1], but there haven't been any new releases since these fixes have been committed to trunk. This change pulls the respective patch in using `fetchpatch` for now -- this patch should be removable with the next release. [1]: https://github.com/twitchax/kord/commit/fa9bb979b17d77f54812a915657c3121f76c5d82 --- pkgs/applications/misc/kord/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index 8283cebb38ab..43be74e13441 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -2,6 +2,7 @@ , stdenv , darwin , fetchFromGitHub +, fetchpatch , rustPlatform , pkg-config , alsa-lib @@ -28,6 +29,17 @@ rustPlatform.buildRustPackage rec { }; }; + patches = [ + # Fixes build issues due to refactored Rust compiler feature annotations. + # Should be removable with the next release after v. 0.6.1. + (fetchpatch { + name = "fix-rust-features.patch"; + url = "https://github.com/twitchax/kord/commit/fa9bb979b17d77f54812a915657c3121f76c5d82.patch"; + hash = "sha256-XQu9P7372J2dHWzvpvbPtALS0Bh8EC+J1EyG3qlak2M="; + excludes = [ "Cargo.*" ]; + }) + ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];