ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 20:48:32 +03:00
Code Issues Projects Releases Wiki Activity

darwin.stdenv: make sure GNU binutils cannot be used

Browse Source 
GNU binutils is not preferred on Darwin, and newer versions have issues building. Make it an evaluation error to use it in the Darwin stdenv bootstrap.
This commit is contained in:
Randy Eckenrode 2024-06-25 00:02:21 -04:00
parent 2b21ece48b
commit c6e9b98725
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,6 +505,8 @@ in
inherit (prevStage) ccWrapperStdenv
coreutils gnugrep;
binutils-unwrapped = builtins.throw "nothing in the bootstrap should depend on GNU binutils";
# Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
cmake = self.cmakeMinimal;
cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: {
@ -1332,8 +1334,6 @@ in
allowedRequisites = (with prevStage; [
bash
binutils.bintools
binutils.bintools.lib
bzip2.bin
bzip2.out
cc.expand-response-params
@ -1433,8 +1433,6 @@ in
in
{ inherit tools libraries; } // tools // libraries
);
inherit (prevStage) binutils binutils-unwrapped;
};
};
})
@ -1455,5 +1453,10 @@ in
assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm;
assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libcxx;
assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.compiler-rt;
# Make sure these evaluate since they were disabled explicitly in the bootstrap.
assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
assert isFromNixpkgs prevStage.binutils-unwrapped.src;
{ inherit (prevStage) config overlays stdenv; })
]