From 3d1c1c5af3e1d97c2c6d0baf877817d09bb0c444 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 19 May 2017 12:34:39 -0500 Subject: llvm-4/*: indicate which build inputs are nativeBuildInputs. --- pkgs/development/compilers/llvm/4/clang/default.nix | 3 ++- pkgs/development/compilers/llvm/4/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/4/lld.nix | 3 ++- pkgs/development/compilers/llvm/4/lldb.nix | 3 ++- pkgs/development/compilers/llvm/4/llvm.nix | 3 ++- pkgs/development/compilers/llvm/4/openmp.nix | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 7e090f5b57ac..4fa180a2701f 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -13,7 +13,8 @@ let 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 = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 559b6b26bc52..3a0e996fb9a0 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { 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 = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index 549fa863c151..f9cd72b4200c 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; - buildInputs = [ cmake llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 6e6fdf012dd6..a0f0a606ad97 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation { 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 ]; CXXFLAGS = "-fno-rtti"; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 29fd3c1f7a39..1a78d672bfef 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -40,7 +40,8 @@ in stdenv.mkDerivation rec { 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 ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index c8ba770e2411..197e9a784653 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; - buildInputs = [ cmake llvm perl ]; + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; enableParallelBuilding = true; -- cgit 1.4.1