Various flake improvements

crystal-linux · Sep 7, 2022 · 306ffc5 · 306ffc5
1 parent 36ae640
commit 306ffc5
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 47 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /target
-Cargo.lock
+/.direnv
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,38 +2,66 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
     utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
+    naersk = {
+      url = "github:nix-community/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, utils, naersk }:
-    utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = nixpkgs.legacyPackages."${system}";
-      naersk-lib = naersk.lib."${system}";
-    in rec 
-    {
-      packages.jade = naersk-lib.buildPackage {
-        pname = "jade";
-        root = ./.;
-      };
-
-      packages.default = packages.jade;
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+    naersk,
+    fenix,
+    ...
+  }:
+    utils.lib.eachDefaultSystem (system: let
+        pkgs = nixpkgs.legacyPackages."${system}";
+        toolchain = with fenix.packages."${system}";
+          combine [
+            latest.rustc
+            latest.cargo
+            latest.clippy
+            latest.rustfmt
+            latest.rust-analyzer
+            latest.rust-src
+          ];
+        naersk-lib = naersk.lib."${system}".override {
+          cargo = toolchain;
+          rustc = toolchain;
+          clippy = toolchain;
+          rustfmt = toolchain;
+          rust-analyzer = toolchain;
+          rust-src = toolchain;
+        };
+      in rec
+      {
+        packages.jade = naersk-lib.buildPackage {
+          pname = "Jade";
+          root = ./.;
+        };
 
-      apps.jade = utils.lib.mkApp {
-        drv = packages.jade;
-      };
-
-      apps.default = apps.jade;
+        packages.default = packages.jade;
 
-      devShells.default = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [
-          rustc
-          cargo
-          rustfmt
-          cargo-audit
-          clippy
-        ];
-      };
-    });
-}
+        apps.jade = utils.lib.mkApp {
+          drv = packages.jade;
+        };
+
+        apps.default = apps.jade;
 
+        devShells.default = pkgs.mkShell {
+          nativeBuildInputs = [
+            toolchain
+          ];
+          # For rust-analyzer
+          RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+        };
+
+        formatter = pkgs.alejandra;
+      });
+}