diff options
| author | Manuel Frischknecht <manuel.frischknecht@gmail.com> | 2024-01-25 20:58:56 +0000 |
|---|---|---|
| committer | Manuel Frischknecht <manuel.frischknecht@gmail.com> | 2024-01-25 22:42:36 +0000 |
| commit | b39ee26c9478ad7e68326e90c571f1e608c56e6e (patch) | |
| tree | cfff4234162f25cecf7818706a2c890058a4aa4f /pkgs/applications/office | |
| parent | 5465c7e2d76fc1c00a996cadc4c859ee7ea856ed (diff) | |
aw-server-rust: fix failing build due to removed unstable feature
Rust compiler plugins have been entirely removed after having been deprecated for years [1]. This caused the build of `aw-server-rust` to break because its `aw-server` crate still contained the respective crate attribute to enable the feature. This attribute has already been removed upstream along with other no longer used unstable feature opt-ins [2]. This change pulls in the respective commit with `fetchpatch` and filters it down to only the changes in `aw-server/src/lib.rs`, which fixes the build for now. The patch should be removable with the next release (0.12.3). [1]: https://github.com/rust-lang/rust/pull/116412 [2]: https://github.com/ActivityWatch/aw-server-rust/commit/e1cd761d2f0a9309eb851b59732c2567a7ae2d3a.patch
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/activitywatch/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 4187da1bfabb2..32c490b0af3dc 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , rustPlatform , makeWrapper , pkg-config @@ -164,6 +165,14 @@ rec { src = ./override-version.patch; version = sources.rev; }) + + # Can be removed with release 0.12.3 + (fetchpatch { + name = "remove-unused-unstable-features.patch"; + url = "https://github.com/ActivityWatch/aw-server-rust/commit/e1cd761d2f0a9309eb851b59732c2567a7ae2d3a.patch"; + hash = "sha256-wP+3XZDkr148XY5b8RV3obuLczAFBE3FhaYPqnmmGcU="; + includes = [ "aw-server/src/lib.rs" ]; + }) ]; nativeBuildInputs = [ |