|
1 | 1 | {
|
2 | 2 | inputs = {
|
3 | 3 | nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
4 |
| - flake-utils.url = "github:numtide/flake-utils"; |
5 |
| - rust-overlay = { |
6 |
| - url = "github:oxalica/rust-overlay"; |
7 |
| - inputs = { |
8 |
| - nixpkgs.follows = "nixpkgs"; |
9 |
| - }; |
10 |
| - }; |
11 |
| - solc = { |
12 |
| - url = "github:hellwolf/solc.nix"; |
13 |
| - inputs = { |
14 |
| - nixpkgs.follows = "nixpkgs"; |
15 |
| - flake-utils.follows = "flake-utils"; |
16 |
| - }; |
| 4 | + fenix = { |
| 5 | + url = "github:nix-community/fenix"; |
| 6 | + inputs.nixpkgs.follows = "nixpkgs"; |
17 | 7 | };
|
18 | 8 | };
|
19 | 9 |
|
20 |
| - outputs = { self, nixpkgs, rust-overlay, flake-utils, solc }: |
21 |
| - flake-utils.lib.eachDefaultSystem (system: |
22 |
| - let |
23 |
| - pkgs = import nixpkgs { |
24 |
| - inherit system; |
25 |
| - overlays = [ rust-overlay.overlays.default solc.overlay ]; |
26 |
| - }; |
27 |
| - lib = pkgs.lib; |
28 |
| - toolchain = pkgs.rust-bin.stable.latest.default.override { |
29 |
| - extensions = [ "rustfmt" "clippy" "rust-src" ]; |
30 |
| - }; |
31 |
| - in |
32 |
| - { |
33 |
| - devShells.default = pkgs.mkShell { |
34 |
| - nativeBuildInputs = with pkgs; [ |
35 |
| - pkg-config |
36 |
| - solc_0_8_23 |
37 |
| - (solc.mkDefault pkgs solc_0_8_23) |
38 |
| - toolchain |
39 |
| - ]; |
40 |
| - buildInputs = lib.optionals pkgs.stdenv.isDarwin [ |
41 |
| - pkgs.darwin.apple_sdk.frameworks.AppKit |
42 |
| - ]; |
43 |
| - packages = with pkgs; [ |
44 |
| - rust-analyzer-unwrapped |
45 |
| - ]; |
| 10 | + outputs = { self, nixpkgs, fenix }: |
| 11 | + let eachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; |
| 12 | + in { |
| 13 | + devShells = eachSystem (system: |
| 14 | + let |
| 15 | + pkgs = import nixpkgs { |
| 16 | + inherit system; |
| 17 | + overlays = [ fenix.overlays.default ]; |
| 18 | + }; |
| 19 | + |
| 20 | + lib = pkgs.lib; |
| 21 | + toolchain = fenix.packages.${system}.stable.toolchain; |
| 22 | + in { |
| 23 | + default = pkgs.mkShell { |
| 24 | + nativeBuildInputs = with pkgs; [ |
| 25 | + pkg-config |
| 26 | + toolchain |
| 27 | + |
| 28 | + # test dependencies |
| 29 | + solc |
| 30 | + vyper |
| 31 | + nodejs |
| 32 | + ]; |
| 33 | + buildInputs = lib.optionals pkgs.stdenv.isDarwin |
| 34 | + [ pkgs.darwin.apple_sdk.frameworks.AppKit ]; |
46 | 35 |
|
47 |
| - # Environment variables |
48 |
| - RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library"; |
49 |
| - LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.libusb1 ]; |
50 |
| - }; |
51 |
| - }); |
| 36 | + packages = with pkgs; [ rust-analyzer-unwrapped ]; |
| 37 | + |
| 38 | + # Environment variables |
| 39 | + RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library"; |
| 40 | + LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.libusb1 ]; |
| 41 | + CFLAGS = "-DJEMALLOC_STRERROR_R_RETURNS_CHAR_WITH_GNU_SOURCE"; |
| 42 | + }; |
| 43 | + }); |
| 44 | + }; |
52 | 45 | }
|
0 commit comments