Skip to content

Commit

Permalink
nix: Return to building with crane (#21292)
Browse files Browse the repository at this point in the history
This removes .envrc, putting it into gitignore as well as building with
crane, as it does not require an up to date hash for a FOD.

Release Notes:

- N/A

cc @mrnugget @jaredramirez
  • Loading branch information
WeetHet authored Nov 29, 2024
1 parent 73f546e commit 94faf9d
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 204 deletions.
2 changes: 0 additions & 2 deletions .envrc

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.direnv
.envrc
.idea
**/target
**/cargo-target
Expand Down
16 changes: 16 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
crane.url = "github:ipetkov/crane";
flake-compat.url = "github:edolstra/flake-compat";
};

outputs =
{ nixpkgs, rust-overlay, ... }:
{
nixpkgs,
rust-overlay,
crane,
...
}:
let
systems = [
"x86_64-linux"
Expand All @@ -27,10 +33,8 @@
};
zed-editor = final: prev: {
zed-editor = final.callPackage ./nix/build.nix {
rustPlatform = final.makeRustPlatform {
cargo = final.rustToolchain;
rustc = final.rustToolchain;
};
crane = crane.mkLib final;
rustToolchain = final.rustToolchain;
};
};
};
Expand Down
Loading

0 comments on commit 94faf9d

Please sign in to comment.