chore(nix): De-couple atuin nix build from nixpkgs rustc version (#2123)

atuinsh · Jun 13, 2024 · 4ee7db5 · 4ee7db5
1 parent 9fa223e
commit 4ee7db5
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,18 +6,35 @@
       url = "github:edolstra/flake-compat";
       flake = false;
     };
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs = {
     self,
     nixpkgs,
     flake-utils,
+    fenix,
     ...
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = nixpkgs.outputs.legacyPackages.${system};
     in {
       packages.atuin = pkgs.callPackage ./atuin.nix {
         inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
+        rustPlatform = let
+          toolchain =
+            fenix.packages.${system}.fromToolchainFile
+            {
+              file = ./rust-toolchain.toml;
+              sha256 = "sha256-7QfkHty6hSrgNM0fspycYkRcB82eEqYa4CoAJ9qA3tU=";
+            };
+        in
+          pkgs.makeRustPlatform {
+            cargo = toolchain;
+            rustc = toolchain;
+          };
       };
       packages.default = self.outputs.packages.${system}.atuin;