Merge master into closure-size

The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
@@ -74,7 +74,7 @@ in stdenv.mkDerivation {
    mv "$bin/lib" "$static/"
  '';

-  patchPhase = ''
+  postPatch = ''
    substituteInPlace Makefile --replace CC=gcc CC=cc
    substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
  '' + stdenv.lib.optionalString stdenv.isDarwin ''