From f7cc62aca9157a8ad357153cfae3e2b5cf2a5b8d Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Tue, 27 Dec 2022 20:12:30 -0500
Subject: Fix toolchain used in dev shell

---
 flake.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 1db76c1..2241fa6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,6 @@
       overlays = [ (import rust-overlay) ];
     };
 
-    craneLib = crane.lib.${system};
-
     buildInputs = with pkgs; [
       trunk
       cargo-wasi
@@ -34,11 +32,11 @@
       wasm-bindgen-cli
     ];
 
-    rustWithWasmTarget = pkgs.rust-bin.stable.latest.default.override {
+    rustToolchain = pkgs.rust-bin.stable.latest.default.override {
       targets = [ "wasm32-unknown-unknown" "wasm32-wasi" ];
     };
 
-    craneLibWithWasmTarget = (crane.mkLib pkgs).overrideToolchain rustWithWasmTarget;
+    craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
 
     commonArgs = {
       inherit buildInputs;
@@ -53,7 +51,7 @@
       cargoExtraArgs = "--workspace --exclude webapp";
     });
 
-    cargoArtifactsForWasm = craneLibWithWasmTarget.buildDepsOnly (commonArgsForWasm // {
+    cargoArtifactsForWasm = craneLib.buildDepsOnly (commonArgsForWasm // {
       cargoExtraArgs = "--workspace --exclude server --target wasm32-unknown-unknown";
     });
 
@@ -73,7 +71,7 @@
       src = ./.;
     });
 
-    packages.bridge-webapp = craneLibWithWasmTarget.buildPackage (commonArgsForWasm // {
+    packages.bridge-webapp = craneLib.buildPackage (commonArgsForWasm // {
       cargoArtifacts = cargoArtifactsForWasm;
       src = ./.;
       cargoExtraArgs = "--target wasm32-unknown-unknown";
@@ -92,7 +90,7 @@
     devShells.default = pkgs.mkShell {
       inputsFrom = builtins.attrValues self.packages;
       nativeBuildInputs = with pkgs; [
-        cargo
+        rustToolchain
         cargo-watch
         rustfmt
         sqlx-cli
-- 
cgit v1.2.3