From 28392a3d6b13efc4dc3d44239b6c1c3709346e8e Mon Sep 17 00:00:00 2001
From: Jay Querie <jay@querie.cc>
Date: Sat, 1 Jul 2023 07:25:49 -0700
Subject: [PATCH] nix-flake: expose all rust tools in dev environment (..)

The `oxalica / rust-overlay` docs expose all tools in the development
environment, so we should do the same:

https://github.com/oxalica/rust-overlay#use-in-devshell-for-nix-develop
---
 flake.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index fce7b6d95c..a9b0580e13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,21 +11,7 @@
   outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        overlays = [
-          # - - -
-          (import rust-overlay)
-
-          # - - -
-          (self: super: let
-            rust-bin = super.rust-bin.selectLatestNightlyWith(toolchain: toolchain.default.override {
-              extensions= [ "rust-src" "rust-analyzer" ];
-              targets = [ "wasm32-unknown-unknown" ];
-            });
-          in {
-            rustc = rust-bin;
-            cargo = rust-bin;
-          })
-        ];
+        overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs {
           inherit system overlays;
         };
@@ -37,9 +23,11 @@
             openssl
             pkg-config
             cacert
-            rustc
-            cargo
             mdbook
+            (rust-bin.selectLatestNightlyWith(toolchain: toolchain.default.override {
+              extensions= [ "rust-src" "rust-analyzer" ];
+              targets = [ "wasm32-unknown-unknown" ];
+            }))
           ];
 
           shellHook = ''