From 75504615ad2e85be3721c9af75a741dd7c2ed2b3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 4 Jul 2024 10:44:05 -0400 Subject: [PATCH] stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After https://github.com/NixOS/nixpkgs/pull/322388, darwin.cctools is just Apple’s cctools again. The replacement for what the bootstrap tools wants is darwin.binutils-unwrapped. --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index bacad15a68bc..3d1894315ff1 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -40,8 +40,6 @@ rec { NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; }); - cctools_ = darwin.cctools; - # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; @@ -112,7 +110,7 @@ rec { # Copy binutils. for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do - cp ${getBin cctools_}/bin/$i $out/bin + cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin done # Copy coreutils, bash, etc.