From e88098b92251e632f976f72ded23ed27b36a7a45 Mon Sep 17 00:00:00 2001 From: yaoshiu Date: Sat, 27 Apr 2024 22:40:30 +0800 Subject: [PATCH] nix: fix devShell --- Cargo.lock | 2 +- flake.nix | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3880066..c85a60f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -921,7 +921,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-derby" -version = "0.4.1" +version = "0.4.2" dependencies = [ "chrono", "clap", diff --git a/flake.nix b/flake.nix index ddcf910..9b5598c 100644 --- a/flake.nix +++ b/flake.nix @@ -62,10 +62,20 @@ devShells.default = with pkgs; mkShell { - buildInputs = [ - toolchain - iconv - ] ++ (lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]); + buildInputs = + let + toolchain = + with fenix.packages.${system}; + combine [ + minimal.cargo + minimal.rustc + ]; + in + [ + toolchain + iconv + ] + ++ (lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]); }; formatter = pkgs.nixfmt-rfc-style;