freshBootstrapTools.bootstrapTools: switch to llvm-readtapi#383108
Merged
reckenrode merged 1 commit intoNixOS:staging-nextfrom Feb 18, 2025
Merged
freshBootstrapTools.bootstrapTools: switch to llvm-readtapi#383108reckenrode merged 1 commit intoNixOS:staging-nextfrom
reckenrode merged 1 commit intoNixOS:staging-nextfrom
Conversation
github-actions
bot
added
10.rebuild-darwin: 0
paparodeo
approved these changes
Feb 18, 2025
Contributor
|
should this target staging-next as the build breaks on master due to using old ld64? |
After the LLVM update, it is no longer necessary to use tapi. The library can also be dropped because a vendored version is now used with ld64 instead of the full dylib.
reckenrode
force-pushed
the
push-ktvvzpwrloop
branch
from
f89f814 to
9fdd4f3
Compare
Contributor
Author
|
I re-targeted staging-next due to the need for the ld64 update. I’ll merge once all checks pass. |
Contributor
|
looks like #379368 broke the build: using the attribute `bashNonInteractive` rather than `bash` fixes the build for me.diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
index 1f50bcf5188a..a45291072abd 100644
--- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix
@@ -1,7 +1,7 @@
{
lib,
stdenv,
- bash,
+ bashNonInteractive,
bzip2,
coreutils,
cpio,
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
cp ${getBin coreutils_}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
- cp -d ${getBin bash}/bin/{ba,}sh $out/bin
+ cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin
cp -d ${getBin diffutils}/bin/* $out/bin
cp ${getBin findutils}/bin/{find,xargs} $out/bin
cp -d ${getBin gawk}/bin/{g,}awk $out/bin
@@ -190,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
# tools needed to unpack bootstrap archive
mkdir -p unpack/bin unpack/lib
- cp -d ${getBin bash}/bin/{bash,sh} unpack/bin
+ cp -d ${getBin bashNonInteractive}/bin/{ba,}sh unpack/bin
cp ${getBin coreutils_}/bin/mkdir unpack/bin
cp ${getBin gnutar}/bin/tar unpack/bin
cp ${getBin xz}/bin/xz unpack/bin
|
Member
|
Confirmed. Pushed as bd4cd0a to resolve that channel blocker. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After the LLVM update, it is no longer necessary to use tapi. The library can also be dropped because a vendored version is now used with ld64 instead of the full dylib.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.