summary refs log tree commit diff
path: root/pkgs/servers/nosql/rethinkdb
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-27 13:06:00 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-27 13:12:24 -0700
commit5b0a676d5b29ed1586a18cb35ed508ec48600a8f (patch)
tree026de5623748b045a463f471c0e198d1f17445a6 /pkgs/servers/nosql/rethinkdb
parent6e2103068d6a8de3780b5e9ca275b0d6d548e979 (diff)
downloadnixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar.gz
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar.bz2
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar.lz
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar.xz
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.tar.zst
nixpkgs-5b0a676d5b29ed1586a18cb35ed508ec48600a8f.zip
rethinkdb: Remove pin on boost 1.55 and remove gperf dependency
Diffstat (limited to 'pkgs/servers/nosql/rethinkdb')
-rw-r--r--pkgs/servers/nosql/rethinkdb/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index cbf0d5bf183..789aa95b157 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, which, protobuf, gperftools
-, boost, zlib, curl, python, m4, icu, jemalloc }:
+{ stdenv, fetchurl, which, m4, python
+, protobuf, boost, zlib, curl, openssl, icu, jemalloc
+}:
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
@@ -15,12 +16,17 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  configureFlags = "--lib-path ${gperftools}/lib --lib-path ${jemalloc}/lib";
+  configureFlags = [
+    "--with-jemalloc"
+    "--lib-path=${jemalloc}/lib"
+  ];
 
-  buildInputs = [ protobuf boost zlib curl icu jemalloc ];
+  buildInputs = [ protobuf boost zlib curl openssl icu jemalloc ];
 
   nativeBuildInputs = [ which m4 python ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "An open-source distributed database built with love";
     longDescription = ''