diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index d2be57b1a5f..2c79d7b3b1b 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - 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/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 6fa1a0cf2e2..3f0cd7d0a76 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 6b98a5726cf..45fb7b5be4f 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 0f259977f70..2c65234b6a4 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 ]; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index c3bf0b48d64..3735fb6a02c 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/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.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index 65345ca6992..dc508757ab6 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index f8020116750..71b67aa7dc5 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) , darwin @@ -53,7 +52,7 @@ in stdenv.mkDerivation rec { groff libxml2 libffi - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index fecf65136bc..c46e520a33d 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -28,7 +28,6 @@ let llvm = overrideManOutput (callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }); clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index bc8453f743a..a371296db32 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -12,7 +12,6 @@ , release_version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -42,8 +41,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 66985861e38..5070de1f48b 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -43,7 +43,8 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + # TODO(@Ericson2314): Remove next mass rebuild + ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 17c743c0408..bbac21ef679 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -25,9 +25,7 @@ let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { - llvm = overrideManOutput (callPackage ./llvm.nix { - inherit (targetLlvmLibraries) libcxxabi; - }); + llvm = overrideManOutput (callPackage ./llvm.nix { }); clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; }); diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 8877ccd1162..9cae65ef103 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -11,7 +11,6 @@ , version , release_version , zlib -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -40,8 +39,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ];