summary refs log tree commit diff
path: root/pkgs/development/libraries/folly
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-07-27 15:52:39 +0300
committerNikolay Amiantov <ab@fmap.me>2017-07-27 17:07:44 +0300
commit147d6f7ac3090ddfd07bde75cadc97336adfdd36 (patch)
tree38c36b84eedc988b9c44f22436bf62d8bdcc11d8 /pkgs/development/libraries/folly
parentbf01fc7b35094c9a6595c05980928b46d4a2ebb4 (diff)
downloadnixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar.gz
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar.bz2
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar.lz
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar.xz
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.tar.zst
nixpkgs-147d6f7ac3090ddfd07bde75cadc97336adfdd36.zip
folly: 2016.12.19.00 -> 2017.07.24.00
Diffstat (limited to 'pkgs/development/libraries/folly')
-rw-r--r--pkgs/development/libraries/folly/default.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 1e8d7ce543f..927e11dac9e 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,15 +3,23 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2016.12.19.00";
+  version = "2017.07.24.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
+    sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169";
   };
 
+  patches = [
+    # Fix compilation
+    (fetchpatch {
+      url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch";
+      sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];