Skip to content

Commit

Permalink
Fix Cargo mismatch on MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
SchahinRohani committed Jun 6, 2024
1 parent c0c09ed commit 803f177
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
name = "nativelink"
version = "0.4.0"
edition = "2021"
rust-version = "1.77.2"
rust-version = "1.78.0"

[profile.release]
lto = true
Expand Down
6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
systems = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-linux"
"aarch64-darwin"
];
imports = [
Expand Down Expand Up @@ -87,7 +88,10 @@

craneLib =
if pkgs.stdenv.isDarwin
then crane.lib.${system}
then
(crane.mkLib pkgs).overrideToolchain (stable-rust.default.override {
targets = ["aarch64-apple-darwin"];
})
else
(crane.mkLib pkgs).overrideToolchain (stable-rust.default.override {
targets = ["x86_64-unknown-linux-musl"];
Expand Down

0 comments on commit 803f177

Please sign in to comment.