public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin: add apple cli-tools to initialPath so we can handle overrideCC

Browse Source 
fixes #6934
This commit is contained in:
Eric Seidel 2015-03-24 17:32:27 -07:00
parent b50848b64c
commit 7f5367c69d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/darwin/default.nix
View File

@ -64,7 +64,9 @@ rec {
name = "stdenv-darwin-boot-1"; name = "stdenv-darwin-boot-1";
inherit system config; inherit system config;
inherit (stage0.stdenv) shell initialPath fetchurlBoot; inherit (stage0.stdenv) shell fetchurlBoot;
initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
preHook = preHook + "\n" + '' preHook = preHook + "\n" + ''
export NIX_LDFLAGS_AFTER+=" -L/usr/lib" export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
@ -82,7 +84,7 @@ rec {
cc = { cc = {
name = "clang-9.9.9"; name = "clang-9.9.9";
cc = "/usr"; cc = "/usr";
outPath = "${buildTools.tools}/Library/Developer/CommandLineTools/usr"; outPath = nativePrefix;
}; };
}; };
}; };
@ -126,7 +128,7 @@ rec {
nativeTools = false; nativeTools = false;
nativeLibc = true; nativeLibc = true;
binutils = pkgs.darwin.cctools; binutils = pkgs.darwin.cctools;
cc = pkgs.llvmPackages.clang; cc = pkgs.llvmPackages.clang-unwrapped;
coreutils = pkgs.coreutils; coreutils = pkgs.coreutils;
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";
extraPackages = [ pkgs.libcxx ]; extraPackages = [ pkgs.libcxx ];