clang-wrapper: Remove explicit dependency on libc++

Now libc++ is just another build input propagated from clang-wrapper.

1 files changed, 6 insertions, 5 deletions

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6ab83aae188b..08d9e713494a 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -28,11 +28,12 @@ import ../generic rec {
     nativeTools = false;
     nativeLibc = true;
     inherit stdenv;
-    libcxx = if haveLibCxx then pkgs.libcxx.override {
-      libcxxabi = pkgs.libcxxabi.override {
-        libunwind = pkgs.libunwindNative;
-      };
-    } else null;
+    extraPackages =
+      stdenv.lib.optional haveLibCxx (pkgs.libcxx.override {
+        libcxxabi = pkgs.libcxxabi.override {
+          libunwind = pkgs.libunwindNative;
+        };
+      });
     binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
     clang = if useClang33 then pkgs.clang_33.clang else pkgs.clang.clang;
     coreutils = pkgs.coreutils;