Merge branch 'master' into closure-size

2015-11-29 16:50:26 +01:00
parent 07a0204282 a9056371a0
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
    substituteInPlace CMakeLists.txt \
       --replace "tidy/tidy.h" "tidy.h" \
       --replace "/usr/include/tidy" "${libtidy}/include" \
-       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" \
+       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
+    substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
+      --replace buffio.h tidybuffio.h
+>>>>>>> master
  '';

  cmakeFlags = [