From 3b6e7fe123ad8dec62e780bac6efe7754a3cbca4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Aug 2017 12:37:48 -0400 Subject: [PATCH] darwin-stdenv: Don't use `nativeTools` Now, we'll actually use the wrapped ld to link --- pkgs/stdenv/darwin/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6739ce3f5c8..9070f4b6dca 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -79,15 +79,17 @@ in rec { inherit shell; inherit (last) stdenv; - nativeTools = true; - nativePrefix = bootstrapTools; + nativeTools = false; nativeLibc = false; buildPackages = lib.optionalAttrs (last ? stdenv) { inherit (last) stdenv; }; libc = last.pkgs.darwin.Libsystem; isClang = true; - cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; + cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; + binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; + coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; + gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; }; preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''