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

llvm-4/*: indicate which build inputs are nativeBuildInputs.

Browse Source
This commit is contained in:
Will Dietz 2017-05-19 12:34:39 -05:00
parent 9aa3548931
commit 3d1c1c5af3
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/llvm/4/clang/default.nix
View File

@ -13,7 +13,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
buildInputs = [ cmake libedit libxml2 llvm python python.pkgs.sphinx ]; nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
buildInputs = [ libedit libxml2 llvm ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"

3
pkgs/development/compilers/llvm/4/libc++abi.nix
View File

@ -5,7 +5,8 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw"; src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}

3
pkgs/development/compilers/llvm/4/lld.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation {
src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
buildInputs = [ cmake llvm ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvm ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

3
pkgs/development/compilers/llvm/4/lldb.nix
View File

@ -29,7 +29,8 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
''; '';
buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ] nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
CXXFLAGS = "-fno-rtti"; CXXFLAGS = "-fno-rtti";

3
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -40,7 +40,8 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
buildInputs = [ perl groff cmake libxml2 python libffi python.pkgs.sphinx ] nativeBuildInputs = [ perl groff cmake python python.pkgs.sphinx ];
buildInputs = [ libxml2 libffi ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];

3
pkgs/development/compilers/llvm/4/openmp.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation {
src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
buildInputs = [ cmake llvm perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];
enableParallelBuilding = true; enableParallelBuilding = true;