Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-07-27 17:48:09 -07:00
commit eb4a73af93

View File

@ -11,12 +11,21 @@ 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"
]; ];