nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

folly: 12 -> 17, fix build

Browse Source
This commit is contained in:
Domen Kožar 2014-12-03 23:12:32 +01:00
parent b7a504ea6b
commit f058618019
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/folly/105.patch Normal file
View File

@ -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>

12
pkgs/development/libraries/folly/default.nix
View File

@ -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 ];