diff options
| -rw-r--r-- | pkgs/development/libraries/folly/105.patch | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/folly/default.nix | 18 |
2 files changed, 9 insertions, 31 deletions
diff --git a/pkgs/development/libraries/folly/105.patch b/pkgs/development/libraries/folly/105.patch deleted file mode 100644 index bfc92b39ae3..00000000000 --- a/pkgs/development/libraries/folly/105.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 66d4f73096b..e2ac798d203 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog +{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - name = "folly-17"; - - src = fetchgit { - url = "https://github.com/facebook/folly"; - rev = "2c2d5777cd2551397a920007589fd3adba6cb7ab"; - sha256 = "13mfnv04ckkr2syigaaxrbaxmfiwqvn0a7fjxvdi6dii3fx81rsx"; + version = "0.22.0"; + name = "folly-${version}"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "folly"; + rev = "v${version}"; + sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca"; }; - patches = [ ./105.patch ]; - buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; nativeBuildInputs = [ autoreconfHook python boost ]; |