From 49edaf0ae18e104d37fe8a609060219d46bf1016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Wed, 9 Dec 2020 21:15:07 +0000
Subject: [PATCH] shell.nix: Use nixpkgs' rust-analyzer

See issue linked in the comment; this is more stable.
---
 shell.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/shell.nix b/shell.nix
index 232285d..9ce587d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -8,10 +8,9 @@ with pkgs;
 
 mkShell {
   buildInputs = [
-    rustChannel.rust
+    rust-analyzer # the one from Mozilla is slightly broken https://github.com/mozilla/nixpkgs-mozilla/issues/238
+    (pkgs.latest.rustChannels.stable.rust.override {
+      # extensions = ["rust-src"]; # unneeded because we're using rust-analyzer from nixpkgs
+    })
   ];
-
-  shellHook = ''
-    export RUST_SRC_PATH="${rustChannel.rust-src}/lib/rustlib/src/rust/library"
-  '';
 }