Skip to content

Commit

Permalink
devenv: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
sandydoo committed Dec 27, 2024
1 parent c48fa1a commit 7216899
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions devenv/src/devenv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ const FLAKE_TMPL: &str = include_str!("flake.tmpl.nix");
const REQUIRED_FILES: [&str; 4] = ["devenv.nix", "devenv.yaml", ".envrc", ".gitignore"];
const EXISTING_REQUIRED_FILES: [&str; 1] = [".gitignore"];
const PROJECT_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/init");
static DIRENVRC: Lazy<String> = Lazy::new(|| {
pub static DIRENVRC: Lazy<String> = Lazy::new(|| {
include_str!("../../direnvrc").replace(
"DEVENV_DIRENVRC_ROLLING_UPGRADE=0",
"DEVENV_DIRENVRC_ROLLING_UPGRADE=1",
)
});
static DIRENVRC_VERSION: Lazy<u8> = Lazy::new(|| {
pub static DIRENVRC_VERSION: Lazy<u8> = Lazy::new(|| {
DIRENVRC
.lines()
.find(|line| line.contains("export DEVENV_DIRENVRC_VERSION"))
Expand Down Expand Up @@ -846,7 +846,7 @@ impl Devenv {
self.devenv_tmp,
self.devenv_runtime.display(),
is_testing,
DIRENVRC_VERSION
DIRENVRC_VERSION.to_string()
);
let flake = FLAKE_TMPL.replace("__DEVENV_VARS__", &vars);
let flake_path = self.devenv_root.join(DEVENV_FLAKE);
Expand Down
2 changes: 1 addition & 1 deletion devenv/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() -> Result<()> {
let command = match cli.command {
None | Some(Commands::Version) => return print_version(),
Some(Commands::Direnvrc) => {
print!("{}", devenv::DIRENVRC);
print!("{}", devenv::DIRENVRC.to_string());
return Ok(());
}
Some(cmd) => cmd,
Expand Down

0 comments on commit 7216899

Please sign in to comment.