Merge remote-tracking branch 'upstream/master' into staging

2018-05-08 09:36:00 -05:00
parent 4f7cdd35d5 3510b983c4
commit 6748534d83
317 changed files with 7440 additions and 6298 deletions
@@ -34,7 +34,7 @@ common = rec { # attributes common to both builds
    sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
  '';

-  patches = [ ./cmake-includedir.patch ]
+  patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
    ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;

  cmakeFlags = [