Merge staging-next into master

2019-03-01 09:06:20 +01:00
parent 456ff62ff8 fc4a8f63c4
commit 2fcb11a244
682 changed files with 2751 additions and 1768 deletions
@@ -36,11 +36,6 @@ stdenv.mkDerivation rec {

  linkCxxAbi = stdenv.isLinux;

-  postInstall = ''
-    mv $out/lib/libc++.a $out/lib/libc++_static.a
-    cp ${./libc++.a} $out/lib/libc++.a
-  '';
-
  setupHooks = [
    ../../../../../build-support/setup-hooks/role.bash
    ./setup-hook.sh
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)