1 files changed, 23 insertions, 22 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 4b69996473d4..c3bf0b48d649 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,11 +1,9 @@
 { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
-
   version = "3.9.1";
 
   fetch = fetch_v version;
@@ -17,43 +15,46 @@ let
   compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
   clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+  in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    libclang = self.clang-unwrapped.lib;
+    libclang = tools.clang-unwrapped.lib;
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
+    lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
 
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
 
-    lldb = callPackage ./lldb.nix {};
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools