Skip to content

fix: case insensitive source directory #45

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.

Sign up for GitHub

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

Merged
samuelburnham merged 2 commits into from
Aug 22, 2026
+8 −7
Merged

fix: case insensitive source directory #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2776e43
fix: avoid case-insensitive source directory collision
MuNeNiCK Aug 5, 2026
a749c4c
fix: clone BLAKE3 into `.lake` and update the remaining paths
samuelburnham Aug 22, 2026
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Lean
/.lake
# Local clone for Lake build
/blake3

# Rust
**/target
Expand Down
7 changes: 3 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@
disableCargoBuild = ''
substituteInPlace lakefile.lean --replace-fail 'proc { cmd := "cargo"' '--proc { cmd := "cargo"'
'';
# `-fn` so it overwrites the symlink rsynced in from a prior stage's `.lake`
linkBlake3Src = ''
ln -s ${blake3.outPath} ./blake3
mkdir -p .lake
ln -sfn ${blake3.outPath} .lake/blake3-source
'';
# Copy the `blake3_rs` static lib from Crane to `target/release` so Lake can use it
linkRustLib = ''
Expand Down Expand Up @@ -128,9 +130,6 @@
buildLibrary = true;
postPatch = disableGitClone;
preConfigure = linkBlake3Src;
postInstall = ''
cp -rP ./blake3 $out
'';
};

blake3Rust = lake2nix.mkPackage {
Expand Down
6 changes: 5 additions & 1 deletion lakefile.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ abbrev blake3RepoURL := "https://github.com/BLAKE3-team/BLAKE3"
abbrev blake3RepoTag := "1.8.7"

target cloneBlake3 pkg : GitRepo := do
let repoDir : GitRepo := pkg.dir / "blake3"
-- Under `.lake` rather than the package root: it is already untracked, and a
-- sibling `blake3` directory would collide with `Blake3` on case-insensitive
-- filesystems (macOS, Windows). `lake clean` only clears `.lake/build`, so the
-- clone survives.
let repoDir : GitRepo := pkg.lakeDir / "blake3-source"

-- Clone if it hasn't already been cloned
let alreadyCloned ← repoDir.dir.pathExists
Expand Down