Merge remote-tracking branch 'origin/master' into closure-size

This commit is contained in:
Luca Bruno
2015-11-25 21:31:09 +01:00
659 changed files with 46562 additions and 13611 deletions

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DTHREADSAFE=ON";
nativeBuildInputs = [ cmake pkgconfig python ];
nativeBuildInputs = [ cmake python pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser ];
meta = {