From 06dcba70d7d78ff31f510b1f274788f9070343b6 Mon Sep 17 00:00:00 2001 From: b4mbus Date: Sun, 9 Jun 2024 00:45:04 +0200 Subject: [PATCH] ref(nix): make the flake more idiomatic --- flake.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 859e8fd..14b79ef 100644 --- a/flake.nix +++ b/flake.nix @@ -42,11 +42,11 @@ mkDevShell = rust: pkgs.mkShell { - nativeBuildInputs = buildDeps (rust.override { + packages = buildDeps (rust.override { extensions = ["rust-src"]; }); - RUST_BACKTRACE = 1; + env.RUST_BACKTRACE = 1; }; mkPackage = rust: @@ -55,19 +55,20 @@ rustc = rust; }) .buildRustPackage { - inherit (cargoToml.package) name version; + pname = cargoToml.package.name; + inherit (cargoToml.package) version; src = ./.; cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = buildDeps rust; + buildInputs = buildDeps rust; dontUseCargoParallelTests = true; }; in { - _module.args = { - pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ (import rust-overlay) ]; - }; - }; + _module.args = { + pkgs = import inputs.nixpkgs { + inherit system; + overlays = [(import rust-overlay)]; + }; + }; formatter = pkgs.alejandra;