public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LLVM-3.9: Use nativeBuildInputs instead of buildPackages

This commit is contained in:
Joe Hermaszewski 2017-04-25 22:31:31 +00:00
parent fea424fea3
commit bad5ca0525
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/3.9/clang/default.nix
View File

@ -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 let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; 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 mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
buildInputs = [ buildPackages.cmake libedit libxml2 llvm python ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libedit libxml2 llvm python ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"

9
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@ -42,10 +42,13 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
nativeBuildInputs = [
perl
cmake
python
];
buildInputs = [ buildInputs = [
buildPackages.perl
buildPackages.buildPackages.cmake
buildPackages.python
groff groff
libxml2 libxml2
libffi ] libffi ]