Merge pull request #48721 from oxij/tree/mass-rebuild-complicated-cleanups

treewide: mass rebuild complicated cleanups
2018-10-29 19:17:28 +00:00
parent 1098abf4af 110f16e43e
commit 4a854344b7
8 changed files with 77 additions and 79 deletions
@@ -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 ];