Revert "rethinkdb: Force dynamic linking and allow dependency substitution"
This reverts commit 5960a652f1.
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
This commit is contained in:
@@ -11,21 +11,12 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
|
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 = ''
|
preConfigure = ''
|
||||||
export ALLOW_WARNINGS=1
|
export ALLOW_WARNINGS=1
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--dynamic=all"
|
|
||||||
"--with-jemalloc"
|
"--with-jemalloc"
|
||||||
"--lib-path=${jemalloc}/lib"
|
"--lib-path=${jemalloc}/lib"
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user