diff options
Diffstat (limited to 'pkgs/development/compilers/llvm/6')
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 17c743c04082..bbac21ef6796 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 8877ccd11621..9cae65ef1030 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 ]; |