diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-07-13 07:13:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-07-13 07:13:56 +0200 |
commit | 377324ca6d05eaf76788ff95f17bcb6895bdcf10 (patch) | |
tree | 9cf7e361f087ea413e02cda45a27292bf5e01a08 /pkgs/stdenv | |
parent | 5e6825612c9114c12eb9a99c0b42a5aba6289908 (diff) | |
parent | 1e4290b78c055b3de85e4ad6e73bc147f12e4dd3 (diff) |
Merge branch 'staging-next' (PR #91090)
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b69de041fd23..9de6ef63bfea 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -90,11 +90,11 @@ in rec { inherit shell; inherit (last) stdenvNoCC; - extraPackages = lib.optional (libcxx != null) libcxx; + extraPackages = []; nativeTools = false; nativeLibc = false; - inherit buildPackages coreutils gnugrep bintools; + inherit buildPackages coreutils gnugrep bintools libcxx; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "${name}-clang"; outPath = bootstrapTools; }; @@ -168,8 +168,9 @@ in rec { ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; + passthru = { + isLLVM = true; + }; }; libcxxabi = stdenv.mkDerivation { |