folly: 12 -> 17, fix build

2 files changed, 29 insertions, 5 deletions

diff --git a/pkgs/development/libraries/folly/105.patch b/pkgs/development/libraries/folly/105.patch
new file mode 100644
index 00000000000..bfc92b39ae3
--- /dev/null
+++ b/pkgs/development/libraries/folly/105.patch
@@ -0,0 +1,22 @@
+From 30b8bb70e0fdcc0b85abbfebf43ed9f127db5248 Mon Sep 17 00:00:00 2001
+From: Johnny Robeson <johnny@localmomentum.net>
+Date: Mon, 1 Dec 2014 23:26:27 -0500
+Subject: [PATCH] include gflags header in SSLSessionCacheManager
+
+this is one way to solve #104
+---
+ folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp b/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
+index fc339a1..ca18242 100644
+--- folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
++++ folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
+@@ -7,6 +7,7 @@
+  *  of patent rights can be found in the PATENTS file in the same directory.
+  *
+  */
++#include <gflags/gflags.h>
+ #include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
+ 
+ #include <folly/experimental/wangle/ssl/SSLCacheProvider.h>
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index f8f60ae24e2..27c7b673805 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog
-, google-gflags, python, libiberty }:
+, google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "folly-12";
+  name = "folly-17";
 
   src = fetchgit {
     url = "https://github.com/facebook/folly";
-    rev = "8d3b079a75fe1a8cf5811f290642b4f494f13822";
-    sha256 = "005fa202aca29c3a6757ae3bb050a6e4e5e773a1439f5803257a5f9e3cc9bdb6";
+    rev = "2c2d5777cd2551397a920007589fd3adba6cb7ab";
+    sha256 = "13mfnv04ckkr2syigaaxrbaxmfiwqvn0a7fjxvdi6dii3fx81rsx";
   };
 
-  buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags ];
+  patches = [ ./105.patch ];
+
+  buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
 
   nativeBuildInputs = [ autoreconfHook python boost ];