nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 17:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

darwin.stdenv: use xarMinimal

Browse Source 
Using xarMinimal avoids pulling e2fsprogs and (eventually) macfuse-stubs
into the Darwin stdenv bootstrap.
This commit is contained in:
Randy Eckenrode 2024-10-02 19:07:09 -04:00
parent 76a5ef680e
commit 9c004ef367
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/darwin/default.nix
View File

@ -652,6 +652,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
scons = super.scons.override { python3Packages = self.python3.pkgs; }; scons = super.scons.override { python3Packages = self.python3.pkgs; };
xar = super.xarMinimal;
darwin = super.darwin.overrideScope ( darwin = super.darwin.overrideScope (
selfDarwin: superDarwin: { selfDarwin: superDarwin: {
signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; 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. # Disable tests because they use dejagnu, which fails to run.
libffi = super.libffi.override { doCheck = false; }; libffi = super.libffi.override { doCheck = false; };
xar = super.xarMinimal;
darwin = super.darwin.overrideScope ( darwin = super.darwin.overrideScope (
selfDarwin: superDarwin: selfDarwin: superDarwin:
darwinPackages prevStage darwinPackages prevStage