From b8042b1bc7fabb0bc241667dc2774897291dc2a4 Mon Sep 17 00:00:00 2001 From: Chris O'Brien Date: Sun, 18 Aug 2024 22:16:08 -0700 Subject: [PATCH] fix pkgs -> final in rust overlay, fmt --- overlays/rust-toolchain.nix | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/overlays/rust-toolchain.nix b/overlays/rust-toolchain.nix index 4466beb..be9214c 100644 --- a/overlays/rust-toolchain.nix +++ b/overlays/rust-toolchain.nix @@ -1,21 +1,25 @@ final: prev: let - mkRustToolchain = toml_path: hash: { - fenix-pkgs = (final.fenix.fromToolchainFile { - file = toml_path; - sha256 = hash; - }); - darwin-pkgs = (with pkgs; lib.optionals stdenv.isDarwin [ - # Additional darwin specific inputs - libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]); - complete = [ fenix-pkgs darwin-pkgs ]; - }; + mkRustToolchain = toml_path: hash: + let + fenix-pkgs = (final.fenix.fromToolchainFile { + file = toml_path; + sha256 = hash; + }); + darwin-pkgs = (with final; lib.optionals stdenv.isDarwin [ + # Additional darwin specific inputs + libiconv + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]); + in + { + inherit fenix-pkgs darwin-pkgs; + complete = [ fenix-pkgs darwin-pkgs ]; + }; in { lib = prev.lib // { inherit mkRustToolchain; - }; + }; }