From 9c004ef367a7a3bfaba340453d821be66dfbafcf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 2 Oct 2024 19:07:09 -0400 Subject: [PATCH] darwin.stdenv: use xarMinimal Using xarMinimal avoids pulling e2fsprogs and (eventually) macfuse-stubs into the Darwin stdenv bootstrap. --- pkgs/stdenv/darwin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 1a9c77d73e72..1ae60ab4d821 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -652,6 +652,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check scons = super.scons.override { python3Packages = self.python3.pkgs; }; + xar = super.xarMinimal; + darwin = super.darwin.overrideScope ( selfDarwin: superDarwin: { signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -909,6 +911,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Disable tests because they use dejagnu, which fails to run. libffi = super.libffi.override { doCheck = false; }; + xar = super.xarMinimal; + darwin = super.darwin.overrideScope ( selfDarwin: superDarwin: darwinPackages prevStage