Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lemurs: fix build error caused by rust-lang/rust/issues/115010 #353820

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
tree 18207ad257a4c0a9ffc4fd250360a91d0b5240cb
parent 37963b8ff6945ae8bdbabee658e5e36d0f67b84a
author Noa Aarts <[email protected]> Tue Nov 5 13:49:49 2024 +0100
committer Noa Aarts <[email protected]> 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";
};
}