diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-03-24 17:32:27 -0700 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-03-24 17:33:27 -0700 |
| commit | 7f5367c69df3095eb3890bb116092486b099e7c6 (patch) | |
| tree | 02cbae58fc061e2e79a6509816a56af009094862 /pkgs/stdenv/darwin | |
| parent | b50848b64cc3c03fea8a587c57a841f0eb70f8d1 (diff) | |
| download | nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar.gz nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar.bz2 nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar.lz nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar.xz nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.tar.zst nixlib-7f5367c69df3095eb3890bb116092486b099e7c6.zip | |
darwin: add apple cli-tools to initialPath so we can handle overrideCC
fixes #6934
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index c415a297d845..d4ffc81c0332 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -64,7 +64,9 @@ rec { name = "stdenv-darwin-boot-1"; inherit system config; - inherit (stage0.stdenv) shell initialPath fetchurlBoot; + inherit (stage0.stdenv) shell fetchurlBoot; + + initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ]; preHook = preHook + "\n" + '' export NIX_LDFLAGS_AFTER+=" -L/usr/lib" @@ -82,7 +84,7 @@ rec { cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "${buildTools.tools}/Library/Developer/CommandLineTools/usr"; + outPath = nativePrefix; }; }; }; @@ -126,7 +128,7 @@ rec { nativeTools = false; nativeLibc = true; binutils = pkgs.darwin.cctools; - cc = pkgs.llvmPackages.clang; + cc = pkgs.llvmPackages.clang-unwrapped; coreutils = pkgs.coreutils; shell = "${pkgs.bash}/bin/bash"; extraPackages = [ pkgs.libcxx ]; |