diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-03 16:35:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-03 16:35:02 +0100 |
commit | 8b542037272c4294361b183eb2dd1f7f23b1da67 (patch) | |
tree | 39f86748ba78d61bcecf6e4c0b480e337fe36474 /pkgs/development/libraries | |
parent | dff14ecfbf7246204f80d5d921ab44562ff9f329 (diff) | |
parent | 45db4162014e32ac3039dbabe524766789c58413 (diff) | |
download | nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar.gz nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar.bz2 nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar.lz nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar.xz nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.tar.zst nixlib-8b542037272c4294361b183eb2dd1f7f23b1da67.zip |
Merge pull request #49656 from siddharthist/folly
folly: 2018.08.27.00 -> 2018.10.29.00
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/folly/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 9694765bb93f..1598dafaad05 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent -, double-conversion, glog, google-gflags, python, libiberty, openssl }: +{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog +, google-gflags, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.08.27.00"; + version = "2018.10.29.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz"; + sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab"; }; - nativeBuildInputs = [ autoreconfHook python pkgconfig ]; - buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ]; + nativeBuildInputs = [ cmake ]; - postPatch = "cd folly"; - preBuild = '' - patchShebangs build - ''; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + # See CMake/folly-deps.cmake in the Folly source tree. + buildInputs = [ + boost + double-conversion + glog + google-gflags + libevent + libiberty + openssl + ]; enableParallelBuilding = true; |