From 9fdd4f3a28da9c5664d8666aa8f2ad185ab23bf6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 10 Jan 2025 19:33:46 -0500 Subject: [PATCH] freshBootstrapTools.bootstrapTools: switch to llvm-readtapi 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. --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c..1f50bcf5188a 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -22,7 +22,6 @@ ld64, libffi, libiconv, - libtapi, libxml2, llvmPackages, ncurses, @@ -181,11 +180,10 @@ stdenv.mkDerivation (finalAttrs: { # Copy tools needed to build the SDK cp -d ${getBin jq}/bin/* $out/bin - cp -d ${getBin libtapi}/bin/* $out/bin + cp -d ${getBin llvmPackages.llvm}/bin/llvm-readtapi $out/bin cp -d ${getLib jq}/lib/lib*.dylib $out/lib cp -d ${getLib oniguruma}/lib/lib*.dylib $out/lib - cp -d ${getLib libtapi}/lib/libtapi*.dylib $out/lib # copy sigtool cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin