diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-02 15:33:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-02 15:33:13 +0100 |
| commit | e4c28f78e7a25e68fb738a78845359789e311500 (patch) | |
| tree | 06951f4cc133303957edd96e58d99f6449f2697e /pkgs/stdenv | |
| parent | 3c46f9d63b736a5fcb2d19df498dc13e24743aec (diff) | |
| parent | 6b9b9425aa8939a36227084e01da3d9819c48c1e (diff) | |
| download | nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar.gz nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar.bz2 nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar.lz nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar.xz nixlib-e4c28f78e7a25e68fb738a78845359789e311500.tar.zst nixlib-e4c28f78e7a25e68fb738a78845359789e311500.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 4f91d18a3764..ef1ebfc32c1b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -171,7 +171,7 @@ in rec { ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; + setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; }; libcxxabi = stdenv.mkDerivation { |