diff options
Diffstat (limited to 'pkgs/development/compilers/llvm/3.8')
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/libc++abi.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 6fa1a0cf2e26..3f0cd7d0a763 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -20,7 +20,6 @@ let in { llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 6b98a5726cf6..45fb7b5be4f6 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; - 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/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 0f259977f702..2c65234b6a47 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? true }: @@ -31,8 +30,7 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; + buildInputs = [ perl groff cmake libxml2 python libffi ]; propagatedBuildInputs = [ ncurses zlib ]; |