diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 4659ba211230..046b7f97ba44 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "2015-09-17";
+  version = "0.57.0";
   name = "folly-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
-    rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3";
-    sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb";
+    rev = "v${version}";
+    sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9";
   };
 
+  patches = [
+    # Fix compatibility with Boost 1.59
+    (fetchpatch {
+      url = "https://github.com/facebook/folly/commit/29193aca605bb93d82a3c92acd95bb342115f3a4.patch";
+      sha256 = "1ixpgq1wjr3i7madx4faw72n17ilc9cr435k5w1x95jr954m9j7b";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook python ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 
-  postUnpack = "sourceRoot=\${sourceRoot}/folly";
+  postPatch = "cd folly";
   preBuild = ''
     patchShebangs build
   '';