From 1a4d3ec01800461d82a23d8fd64188cdf3d4dfb3 Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Mon, 25 Mar 2024 22:50:42 +0000 Subject: [PATCH] flake: cleanup of Rust within devShell --- flake.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 47015fb..5587bed 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { - description = "Rust development environment for bunbun using fenix"; + description = "Rust development environment for bunbun"; inputs = { - fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; utils.url = "github:numtide/flake-utils"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; }; @@ -10,27 +9,17 @@ utils.lib.eachDefaultSystem ( system: let - pkgs = import nixpkgs-unstable { inherit system; overlays = [fenix.overlays.default]; }; - toolchain = pkgs.fenix.complete; + pkgs = import nixpkgs-unstable { inherit system; }; in rec { packages.default = - (pkgs.makeRustPlatform { - inherit (toolchain) cargo rustc; - }) - .buildRustPackage { + (pkgs.makeRustPlatform.buildRustPackage { pname = "bunbun"; version = "1.3.0"; src = ./.; cargoLock.lockFile = ./Cargo.lock; }; apps.default = utils.lib.mkApp {drv = packages.default;}; - devShells.default = pkgs.mkShell rec { - buildInputs = with pkgs; [ - (with toolchain; [ cargo rustc rust-src clippy rustfmt ]) - ]; - RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library"; - }; } ); }