Commit 887d33a0 authored by toonn's avatar toonn
Browse files

freshBootstrapTools: Overlay the package set with the desired LLVM 

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.
parent 44cf4801

pkgs/stdenv/darwin/make-bootstrap-tools.nix

+5 −4
Original line number Diff line number Diff line 
{ 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

}:
@@ -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;