From bad5ca052553aefb724e32bed1ea547b911cbb4b Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Tue, 25 Apr 2017 22:31:31 +0000
Subject: [PATCH] LLVM-3.9: Use nativeBuildInputs instead of buildPackages

---
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 6 ++++--
 pkgs/development/compilers/llvm/3.9/llvm.nix          | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 87216e424caf..ec2ec27df363 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, libxml2, libedit, llvm, version, clang-tools-extra_src, python, buildPackages }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,9 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ buildPackages.cmake libedit libxml2 llvm python ];
+    nativeBuildInputs = [ cmake ];
+
+    buildInputs = [ libedit libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 6c86ac0c2942..380abc0b9b47 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -42,10 +42,13 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
 
+  nativeBuildInputs = [
+    perl
+    cmake
+    python
+  ];
+
   buildInputs = [
-    buildPackages.perl
-    buildPackages.buildPackages.cmake
-    buildPackages.python
     groff
     libxml2
     libffi ]