From 91e1f1c9d6dc7c80e6940e73d43b66aba6e4d2a9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:45:45 -0700 Subject: [PATCH] freshBootstrapTools: nixfmt make-bootstrap-tools.nix --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 35 ++++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 0a81b86be5ea..b8189ccf2456 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -9,16 +9,22 @@ }: let - cross = if crossSystem != null - then { inherit crossSystem; } - else {}; + cross = if crossSystem != null then { inherit crossSystem; } else { }; - custom-bootstrap = if bootstrapFiles != null - then { stdenvStages = args: - let args' = args // { bootstrapFiles = bootstrapFiles; }; - in (import "${pkgspath}/pkgs/stdenv/darwin" args'); - } - else {}; + custom-bootstrap = + if bootstrapFiles != null then + { + stdenvStages = + args: + let + args' = args // { + bootstrapFiles = bootstrapFiles; + }; + in + (import "${pkgspath}/pkgs/stdenv/darwin" args'); + } + else + { }; pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); in @@ -40,8 +46,13 @@ rec { # that platform. localSystem = if crossSystem != null then crossSystem else localSystem; - stdenvStages = args: let - args' = args // { inherit bootstrapFiles; }; - in (import (test-pkgspath + "/pkgs/stdenv/darwin") args'); + stdenvStages = + args: + let + args' = args // { + inherit bootstrapFiles; + }; + in + (import (test-pkgspath + "/pkgs/stdenv/darwin") args'); }; }