diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix
index c2c4b484e11..29e06768a73 100644
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl }:
+{ pkgs, newScope, stdenv, isl, fetchurl }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -33,5 +33,9 @@ let
     polly = callPackage ./polly.nix {};
 
     dragonegg = callPackage ./dragonegg.nix {};
+
+    libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
+
+    libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
   };
 in self
diff --git a/pkgs/development/libraries/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
similarity index 100%
rename from pkgs/development/libraries/libc++/darwin.patch
rename to pkgs/development/compilers/llvm/3.5/libc++/darwin.patch
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
similarity index 93%
rename from pkgs/development/libraries/libc++/default.nix
rename to pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 86f03e6a8da..460d71922c6 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
 
   inherit libcxxabi;
 
-  # Remove a Makefile that causes many retained dependencies.
-  postInstall = "rm $out/include/c++/v1/Makefile";
-
   setupHook = ./setup-hook.sh;
 
   meta = {
diff --git a/pkgs/development/libraries/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/libc++/setup-hook.sh
rename to pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
diff --git a/pkgs/development/libraries/libc++abi/darwin.patch b/pkgs/development/compilers/llvm/3.5/libc++abi/darwin.patch
similarity index 100%
rename from pkgs/development/libraries/libc++abi/darwin.patch
rename to pkgs/development/compilers/llvm/3.5/libc++abi/darwin.patch
diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
similarity index 100%
rename from pkgs/development/libraries/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
diff --git a/pkgs/development/libraries/libc++abi/no-stdc++.patch b/pkgs/development/compilers/llvm/3.5/libc++abi/no-stdc++.patch
similarity index 100%
rename from pkgs/development/libraries/libc++abi/no-stdc++.patch
rename to pkgs/development/compilers/llvm/3.5/libc++abi/no-stdc++.patch
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 7283f35f75a..07d9e9269a4 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -130,10 +130,9 @@ rec {
       cc        = pkgs.llvmPackages.clang;
       coreutils = pkgs.coreutils;
       shell     = "${pkgs.bash}/bin/bash";
+      extraPackages = [ pkgs.libcxx ];
     };
 
-    extraBuildInputs = [ pkgs.libcxx ];
-
     shell = "${pkgs.bash}/bin/bash";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63b259ad3d0..faa86b65ca7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3638,7 +3638,7 @@ let
 
   llvm_v = path: callPackage path { };
 
-  llvmPackages = llvmPackages_35;
+  llvmPackages = if stdenv.isDarwin then llvmPackages_35 else llvmPackages_34;
 
   llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
     inherit stdenv newScope fetchurl;
@@ -3647,7 +3647,7 @@ let
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
   llvmPackages_35 = import ../development/compilers/llvm/3.5 {
-    inherit stdenv newScope fetchurl isl;
+    inherit pkgs stdenv newScope fetchurl isl;
   };
 
   manticore = callPackage ../development/compilers/manticore { };
@@ -4685,8 +4685,8 @@ let
 
   csslint = callPackage ../development/web/csslint { };
 
-  libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; };
-  libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; };
+  libcxx = llvmPackages_35.libcxx;
+  libcxxabi = llvmPackages_35.libcxxabi;
 
   libsigrok = callPackage ../development/tools/libsigrok { };