From e2310a655457ae22465714c21f050eece1d85b6b Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 23 Aug 2023 14:00:17 -0700
Subject: [PATCH] Clean up flake.nix

---
 flake.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index dd97bc6..d950ff9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,18 +32,14 @@ Updating `cargoHash`:
       };
       # nightly is required for function signal syntax in leptos
       # https://leptos-rs.github.io/leptos/02_getting_started.html
-      rust-bin = pkgs.rust-bin.nightly.latest.minimal;
-      rust-binWasm = rust-bin.override {
-        targets = [ "wasm32-unknown-unknown" ];
-      };
+      rust = pkgs.rust-bin.nightly.latest;
+      # binary for output binary derivations
+      # (doesn't include dev tooling e.g. clippy)
+      rust-bin = rust.minimal;
       rustPlatform = pkgs.makeRustPlatform {
         cargo = rust-bin;
         rustc = rust-bin;
       };
-      rustPlatformWasm = pkgs.makeRustPlatform {
-        cargo = rust-binWasm;
-        rustc = rust-binWasm;
-      };
       rustSettings = with pkgs; {
         src = ./.;
         cargoHash = nixpkgs.lib.fakeHash;
@@ -56,8 +52,9 @@ Updating `cargoHash`:
     in {
       devShells.${system}.default = with pkgs; mkShell {
         packages = [
-          (rust-binWasm.override {
+          (rust.default.override {
             extensions = [ "rust-src" ];
+            targets = [ "wasm32-unknown-unknown" ];
           })
           bacon
         ];
@@ -75,7 +72,7 @@ Updating `cargoHash`:
           };
         });
         dyesub-tool = let
-          rustToolchain = pkgs.rust-bin.nightly.latest.minimal.override {
+          rustToolchain = rust.minimal.override {
             targets = [ "wasm32-unknown-unknown" ];
           };
           craneLib = ((crane.mkLib pkgs).overrideToolchain rustToolchain).overrideScope' (final: prev: {