Skip to content

Commit

Permalink
lemurs: fix build error caused by rust-lang/rust#115010
Browse files Browse the repository at this point in the history
  • Loading branch information
itepastra authored and Mic92 committed Nov 10, 2024
1 parent 0b67cfb commit 71ef9ca
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
tree 18207ad257a4c0a9ffc4fd250360a91d0b5240cb
parent 37963b8ff6945ae8bdbabee658e5e36d0f67b84a
author Noa Aarts <noa@voorwaarts.nl> Tue Nov 5 13:49:49 2024 +0100
committer Noa Aarts <noa@voorwaarts.nl> Tue Nov 5 13:49:49 2024 +0100

fix static lifetime for string

This fixes a compiler error without changing functionality

diff --git a/src/config.rs b/src/config.rs
index f4bca31..a4fc6bf 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -645,7 +645,7 @@ struct Variable<'a> {
}

impl<'a> Variable<'a> {
- const START_SYMBOL: &str = "$";
+ const START_SYMBOL: &'static str = "$";

fn span(&self) -> std::ops::Range<usize> {
self.start..self.start + Self::START_SYMBOL.len() + self.ident.len()
12 changes: 10 additions & 2 deletions pkgs/applications/display-managers/lemurs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s=";
};

patches = [
# part of https://github.com/coastalwhite/lemurs/commit/09003a830400250ec7745939399fc942c505e6c6, but including the rest of the commit may be breaking
./0001-fix-static-lifetime-string.patch
];

cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo=";

buildInputs = [
Expand All @@ -30,8 +35,11 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Customizable TUI display/login manager written in Rust";
homepage = "https://github.com/coastalwhite/lemurs";
license = with licenses; [asl20 mit];
maintainers = with maintainers; [jeremiahs];
license = with licenses; [
asl20
mit
];
maintainers = with maintainers; [ jeremiahs ];
mainProgram = "lemurs";
};
}

0 comments on commit 71ef9ca

Please sign in to comment.