diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
| commit | 767c179a9440293f259433f6e8bf578176927d72 (patch) | |
| tree | 1902b66023b85f0991d78f4f404bdce12ffb7503 /pkgs/stdenv/darwin | |
| parent | 2c8cf45772862e7e2d77086bbaaa6ac0183ea0bf (diff) | |
| parent | 5a2a71f2c2bbefe01f33c8f0542f57b770a065b2 (diff) | |
| download | nixlib-767c179a9440293f259433f6e8bf578176927d72.tar nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.gz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.bz2 nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.lz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.xz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.zst nixlib-767c179a9440293f259433f6e8bf578176927d72.zip | |
Merge branch 'master' into staging
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 c5ad0d7d08fc..f06170b5cb10 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -68,7 +68,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" @@ -86,7 +88,7 @@ rec { cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "${buildTools.tools}/Library/Developer/CommandLineTools/usr"; + outPath = nativePrefix; }; }; }; @@ -130,7 +132,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 ]; |