From 5960a652f1502260348ad7375ace20959b80abe4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 17:35:05 -0700
Subject: rethinkdb: Force dynamic linking and allow dependency substitution

---
 pkgs/servers/nosql/rethinkdb/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'pkgs/servers/nosql/rethinkdb/default.nix')

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"
   ];
-- 
cgit 1.4.1