From cc1caa87fbbc11338a650623c7776bf57402cd16 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 25 Oct 2021 17:19:24 +0200
Subject: Use Rust binaries from Nix instead of rustup

---
 shell.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index f407ed95..a91a9e20 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,5 @@
 {
   system ? builtins.currentSystem,
-  crossSystem ? null,
   rust ? true,
   integration ? true,
   release ? true,
@@ -10,10 +9,9 @@ with import ./nix/common.nix;
 
 let
   pkgs = import pkgsSrc {
-    inherit system crossSystem;
-    overlays = [ cargo2nixOverlay rustOverlay ];
+    inherit system;
+    overlays = [ cargo2nixOverlay ];
   };
-  rustDist = pkgs.buildPackages.rust-bin.stable.latest.default;
   kaniko = (import ./nix/kaniko.nix) pkgs;
 
 in
@@ -60,7 +58,13 @@ function refresh_index {
   '';
 
   nativeBuildInputs = 
-   (if rust then [ rustDist (pkgs.callPackage cargo2nix {}).package ] else [])
+   (if rust then [
+     pkgs.rustPlatform.rust.rustc
+     pkgs.rustPlatform.rust.cargo
+     pkgs.clippy
+     pkgs.rustfmt
+     /*(pkgs.callPackage cargo2nix {}).package*/
+    ] else [])
    ++
    (if integration then [ pkgs.s3cmd pkgs.awscli2 pkgs.minio-client pkgs.rclone pkgs.socat pkgs.psmisc pkgs.which ] else [])
    ++
-- 
cgit v1.2.3