Skip to content

Commit

Permalink
freshBootstrapTools: Overlay the package set with the desired LLVM
Browse files Browse the repository at this point in the history
As reported in #241692, since the `llvmPackages` bump the
bootstrap-tools started failing to build due to a mismatch in LLVM
versions used to build certain tools.

By overlaying the imported package set to specify `llvmPackages`, we get
everything built with the expected LLVM version.
  • Loading branch information
toonn committed Nov 12, 2023
1 parent 44cf480 commit 887d33a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pkgs/stdenv/darwin/make-bootstrap-tools.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
, localSystem ? { system = builtins.currentSystem; }
# Specify the desired LLVM version in an overlay to avoid the use of
# mismatching versions.
, overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })]
, crossSystem ? null
, bootstrapFiles ? null
}:
Expand All @@ -13,11 +16,9 @@ let cross = if crossSystem != null
in (import "${pkgspath}/pkgs/stdenv/darwin" args');
}
else {};
in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap);
in with import pkgspath ({ inherit localSystem overlays; } // cross // custom-bootstrap);

let
llvmPackages = llvmPackages_11;
in rec {
rec {
coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support.
aclSupport = false;
Expand Down

0 comments on commit 887d33a

Please sign in to comment.