diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-27 17:48:09 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-27 17:48:09 -0700 |
| commit | eb4a73af93d96ce6c2efebcc5017b77c03dc1085 (patch) | |
| tree | 25d3f88a7f5b945529e7a8dcfa220f5e5c727eb9 /pkgs/servers/nosql | |
| parent | 459c3ff560eba8e30ab3e18a58b636860c51d1e2 (diff) | |
| parent | 5960a652f1502260348ad7375ace20959b80abe4 (diff) | |
| download | nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar.gz nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar.bz2 nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar.lz nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar.xz nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.tar.zst nixlib-eb4a73af93d96ce6c2efebcc5017b77c03dc1085.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 789aa95b1577..5d0b68bba2b8 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -11,12 +11,21 @@ stdenv.mkDerivation rec { sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i"; }; + postPatch = '' + # Remove the dependence on bundled libraries + sed -i '/must_fetch_list/ s/ v8//' configure + + # Don't use the default command line args + rm configure.default + ''; + preConfigure = '' export ALLOW_WARNINGS=1 patchShebangs . ''; configureFlags = [ + "--dynamic=all" "--with-jemalloc" "--lib-path=${jemalloc}/lib" ]; |