mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
rethinkdb: Remove pin on boost 1.55 and remove gperf dependency
This commit is contained in:
parent
6e2103068d
commit
5b0a676d5b
@ -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 = ''
|
||||
|
@ -9161,9 +9161,7 @@ let
|
||||
|
||||
restund = callPackage ../servers/restund {};
|
||||
|
||||
rethinkdb = callPackage ../servers/nosql/rethinkdb {
|
||||
boost = boost155;
|
||||
};
|
||||
rethinkdb = callPackage ../servers/nosql/rethinkdb { };
|
||||
|
||||
rippled = callPackage ../servers/rippled {
|
||||
boost = boost157;
|
||||
|
Loading…
Reference in New Issue
Block a user