diff options
| author | Joe Hermaszewski <git@monoid.al> | 2017-04-25 22:31:31 +0000 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2017-04-25 22:31:31 +0000 |
| commit | bad5ca052553aefb724e32bed1ea547b911cbb4b (patch) | |
| tree | 462e3eef2da40fe13b6915983ad02eb5b6ac6529 /pkgs/development/compilers | |
| parent | fea424fea33b7b71dfc43b3297ad2d1d2da36f5a (diff) | |
| download | nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar.gz nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar.bz2 nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar.lz nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar.xz nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.tar.zst nixpkgs-bad5ca052553aefb724e32bed1ea547b911cbb4b.zip | |
LLVM-3.9: Use nativeBuildInputs instead of buildPackages
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/clang/default.nix | 6 | ||||
| -rw-r--r-- | 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 87216e424ca..ec2ec27df36 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 6c86ac0c294..380abc0b9b4 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 ] |