From 629ac021b77d2d09302081ae0d6d8c066b2b3dc4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 6 Aug 2015 16:19:30 +0200 Subject: [PATCH] Revert "rethinkdb: Force dynamic linking and allow dependency substitution" This reverts commit 5960a652f1502260348ad7375ace20959b80abe4. Build is broken since the beginning at configure phase @wkennington , I wonder how you were able to build this. See http://hydra.nixos.org/build/24167778/nixlog/1/raw --- pkgs/servers/nosql/rethinkdb/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 5d0b68bba2b8..789aa95b1577 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -11,21 +11,12 @@ 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" ];