diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-10-29 19:17:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 19:17:28 +0000 |
| commit | 4a854344b707378dba7c69a9881361ca3ed47ce8 (patch) | |
| tree | 0e544776d23f47a5fe5b8a74f8dac730501a24a5 /pkgs/development/compilers/llvm | |
| parent | 1098abf4aff7f58257b0cca3edcabbec550cccdf (diff) | |
| parent | 110f16e43ed4f246186e2ffa2f489a698a0b187c (diff) | |
| download | nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.gz nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.bz2 nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.lz nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.xz nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.zst nixlib-4a854344b707378dba7c69a9881361ca3ed47ce8.zip | |
Merge pull request #48721 from oxij/tree/mass-rebuild-complicated-cleanups
treewide: mass rebuild complicated cleanups
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/5/llvm.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 6dae8be97c88..ae4b27441593 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -36,9 +36,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - # TODO(@Ericson2314): Remove next mass rebuild - ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; |