swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267058 from toonn/bootstrap-tools-specify-llvm

Browse source 
freshBootstrapTools: Overlay the package set with the desired LLVM
This commit is contained in:
K900 2023-11-17 14:06:37 +03:00 committed by GitHub
parent 2542afeb0d 985ff1cb88
commit b40035f472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file

@ -1,5 +1,21 @@
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
, localSystem ? { system = builtins.currentSystem; }
# Specify the desired LLVM version in an overlay to avoid the use of
# mismatching versions.
#
# The llvmPackages that we take things (clang, libc++ and such) from
# is specified explicitly to be llvmPackages_11 to keep the
# bootstrap-tools stable. However, tools like otool,
# install_name_tool and strip are taken straight from stdenv.cc,
# which, after the bump, is a different LLVM version altogether.
#
# The original intent was that bootstrap-tools specified LLVM 11
# exhaustively but it didn't. That should be rectified with this
# PR. As to why stick with 11? That's just to keep the
# bootstrap-tools unchanged.
#
# https://github.com/NixOS/nixpkgs/pull/267058/files#r1390889848
, overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })]
, crossSystem ? null
, bootstrapFiles ? null
}:
@ -13,11 +29,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;