From 0fc9787683e6fef5eaf1b6de5f1f2592c2ab0b19 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 2 Nov 2024 14:48:50 -0700 Subject: [PATCH] darwin.stdenv: add file to early stdenv stages file is part of the final stdenv and llvm_19 requires it for tests. add file to the path to the early stage stdenv's for the upcoming switch to llvm_19 --- pkgs/stdenv/darwin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 60eca7f72de8..35ad94c41633 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -191,6 +191,7 @@ let shell = bash + "/bin/bash"; initialPath = [ bash + prevStage.file bootstrapTools ]; @@ -370,6 +371,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ld64 = null; coreutils = null; + file = null; gnugrep = null; pbzx = null; @@ -416,6 +418,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check coreutils = bootstrapTools; cpio = bootstrapTools; + file = null; gnugrep = bootstrapTools; pbzx = bootstrapTools;