public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rethinkdb: Remove pin on boost 1.55 and remove gperf dependency

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-27 13:06:00 -07:00
parent 6e2103068d
commit 5b0a676d5b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/servers/nosql/rethinkdb/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, which, protobuf, gperftools { stdenv, fetchurl, which, m4, python
, boost, zlib, curl, python, m4, icu, jemalloc }: , protobuf, boost, zlib, curl, openssl, icu, jemalloc
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rethinkdb-${version}"; name = "rethinkdb-${version}";
@ -15,12 +16,17 @@ stdenv.mkDerivation rec {
patchShebangs . 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 ]; nativeBuildInputs = [ which m4 python ];
enableParallelBuilding = true;
meta = { meta = {
description = "An open-source distributed database built with love"; description = "An open-source distributed database built with love";
longDescription = '' longDescription = ''

4
pkgs/top-level/all-packages.nix
View File

@ -9161,9 +9161,7 @@ let
restund = callPackage ../servers/restund {}; restund = callPackage ../servers/restund {};
rethinkdb = callPackage ../servers/nosql/rethinkdb { rethinkdb = callPackage ../servers/nosql/rethinkdb { };
boost = boost155;
};
rippled = callPackage ../servers/rippled { rippled = callPackage ../servers/rippled {
boost = boost157; boost = boost157;