From a5100020f67b20294524102a59f4864d092089d0 Mon Sep 17 00:00:00 2001
From: Thomas Heck <t@b128.net>
Date: Tue, 26 May 2020 12:06:04 +0200
Subject: [PATCH] use rust from nixpkgs

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

diff --git a/shell.nix b/shell.nix
index 5ac233b..3100065 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,14 @@
 let
-    moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
-    nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
-    rustpkgs = nixpkgs.rustChannels.stable;
+    nixpkgs = import <nixpkgs> {};
 in
     with nixpkgs;
     stdenv.mkDerivation {
         name = "audio-conv";
         buildInputs = [
-            rustpkgs.rust
-            rustpkgs.cargo
-            rustpkgs.rls-preview
-            rustpkgs.rustfmt-preview
+            cargo
+            rustc
+            rustfmt
+            rust-analyzer
             gst_all_1.gstreamer
             gst_all_1.gst-plugins-base # needed for opus, resample, ...
             gst_all_1.gst-plugins-good # needed for flac