From 2a552a0888808b8b66a8c7e241462f9a0353e664 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 21 Aug 2016 15:25:57 +0100
Subject: [PATCH] Partially revert "make-bootstrap-tools.darwin: upgrade to
 llvm 3.8"

This partially reverts commit bddf4e21801d0629b608a8a0a46830c795e35ba4.

cc @copumpkin

Was breaking nix-build <nixpkgs/nixos/release-combined.nix> -A nixpkgs.tarball
See http://hydra.nixos.org/build/38886695/nixlog/2
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 83e04bb3339a..0216acee659b 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -1,6 +1,6 @@
-{ pkgspath ? ../../.., test-pkgspath ? pkgspath }:
+{ system ? builtins.currentSystem }:
 
-with import pkgspath { system = builtins.currentSystem; };
+with import ../../.. { inherit system; };
 
 let
   llvmPackages = llvmPackages_38;
@@ -297,8 +297,8 @@ in rec {
 
   # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
   test-pkgs = let
-    stdenv = import "${test-pkgspath}/pkgs/stdenv/darwin" { inherit system bootstrapFiles; };
-  in import test-pkgspath {
+    stdenv = import ./. { inherit system bootstrapFiles; };
+  in import ../../.. {
     inherit system;
     bootStdenv = stdenv.stdenvDarwin;
   };