diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-27 16:11:03 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-27 16:11:03 -0700 |
| commit | 6b55ca513d20b0d82734527378a669cda4d177b1 (patch) | |
| tree | 0a27f19ba5e1d717364a5d8ecb2b44604120cb80 /pkgs/servers/nosql | |
| parent | fa6c8445c768a64c908fcd4d2955843622ba2550 (diff) | |
| parent | 0411a4c376de8b3d9ab2a03c84c8b310f59b6380 (diff) | |
| download | nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar.gz nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar.bz2 nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar.lz nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar.xz nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.tar.zst nixlib-6b55ca513d20b0d82734527378a669cda4d177b1.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 2f47d542d00e..789aa95b1577 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,13 +1,14 @@ -{ 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}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd"; + sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i"; }; preConfigure = '' @@ -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 = '' |