Merge branch 'master' into staging

2015-03-26 14:44:05 -07:00
parent 2c8cf45772 5a2a71f2c2
commit 767c179a94
144 changed files with 6971 additions and 1358 deletions
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  patches = [ ./robomongo.patch ];

  postPatch = ''
-    rm ./cmake/FindOpenSSL.cmake
+    rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file
  '';

  NIX_CFLAGS_COMPILE = "-fno-stack-protector";