diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-02 15:32:41 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-02 15:32:41 +0100 |
| commit | 6b9b9425aa8939a36227084e01da3d9819c48c1e (patch) | |
| tree | 862fd15e050242564d468d247099b1a4b1fb571e /pkgs/stdenv | |
| parent | 5cc0468a206c93ff246605a18eff562619d5a3b7 (diff) | |
| parent | c195ef6aab79b8194158b0b2fadbf96f986b14c8 (diff) | |
| download | nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar.gz nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar.bz2 nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar.lz nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar.xz nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.tar.zst nixlib-6b9b9425aa8939a36227084e01da3d9819c48c1e.zip | |
Merge master into staging-next
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 f73fca48b7a7..874b26ba89ee 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -165,7 +165,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 { |