From aa022fe78e5a0bd1398d8def231b3b7d89da65eb Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 20 May 2022 10:33:16 +0530 Subject: [PATCH] Revert "feat: use Rust from nixpkgs" This reverts commit d1c7734979ae5cc1a8a9e42c97c36323d7f6c337. --- shell.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 10b794b..fb36159 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,15 @@ with import { overlays = [ (import ) ]; }; mkShell { - buildInputs = [ cargo python39 rustc xorg.libxcb ] - ++ pkgs.lib.optionals stdenv.isDarwin + buildInputs = [ + (rust-bin.stable.latest.default.override { + extensions = [ "rust-src" "rustfmt-preview" ]; + targets = + pkgs.lib.optionals pkgs.stdenv.isDarwin [ "aarch64-apple-darwin" ] + ++ pkgs.lib.optionals pkgs.stdenv.isLinux + [ "x86_64-unknown-linux-gnu" ]; + }) + xorg.libxcb + python39 + ] ++ pkgs.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.AppKit ]; }