Skip to content

Commit 87e0b46

Browse files
committed
Fix Nix build
1 parent 1475322 commit 87e0b46

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

flake.nix

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@
4343
}: let
4444
lake2nix = pkgs.callPackage lean4-nix.lake {};
4545

46+
# Filter out build directories
47+
lakeSrc = pkgs.lib.cleanSourceWith {
48+
src = ./.;
49+
filter = path: type: let
50+
name = builtins.baseNameOf path;
51+
in
52+
name
53+
!= "target"
54+
&& name != ".lake"
55+
&& name
56+
!= "build";
57+
};
58+
4659
# Lakefile patches for Nix builds
4760
disableGitClone = ''
4861
substituteInPlace lakefile.lean --replace-fail 'GitRepo.execGit' '--GitRepo.execGit'
@@ -87,7 +100,7 @@
87100

88101
blake3C = lake2nix.mkPackage {
89102
name = "Blake3C";
90-
src = ./.;
103+
src = lakeSrc;
91104
buildLibrary = true;
92105
postPatch = disableGitClone;
93106
preConfigure = linkBlake3Src;
@@ -98,17 +111,17 @@
98111

99112
blake3Rust = lake2nix.mkPackage {
100113
name = "Blake3Rust";
101-
src = ./.;
114+
src = lakeSrc;
102115
postPatch = disableCargoBuild;
103116
postConfigure = linkRustLib;
104117
postInstall = ''
105-
cp -rP rust/target/release $out/rust/target
118+
cp -rP rust/target/ $out/rust/target/
106119
'';
107120
};
108121

109122
blake3Test = lake2nix.mkPackage {
110123
name = "Blake3Test";
111-
src = ./.;
124+
src = lakeSrc;
112125
installArtifacts = false;
113126
# Merge .lake artifacts from both C and Rust library builds
114127
prePatch = ''

0 commit comments

Comments
 (0)