diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-01-27 10:46:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-27 10:46:04 -0500 |
| commit | 3971b4166115c15a6865b4e64fbcdd3044087aeb (patch) | |
| tree | 0bc8bc72ff555004ad4dbbc392bd22ab650dfd53 /pkgs/applications/office | |
| parent | e0be3bfaf0300a22e60de8b4ecab9442fe610704 (diff) | |
| parent | b39ee26c9478ad7e68326e90c571f1e608c56e6e (diff) | |
| download | nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar.gz nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar.bz2 nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar.lz nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar.xz nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.tar.zst nixlib-3971b4166115c15a6865b4e64fbcdd3044087aeb.zip | |
Merge pull request #283864 from mfrischknecht/fix-aw-server-rust-build
aw-server-rust: fix failing build due to removed unstable rust feature
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 4187da1bfabb..32c490b0af3d 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 = [ |