mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 14:57:28 +03:00
rethinkdb: use clangStdenv
And remove patch working around a GCC bug.
This commit is contained in:
parent
8025e4ffe4
commit
9b2769b061
@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b";
|
sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Don't make V8 snapshots, as those segfault.
|
|
||||||
patches = [ ./v8-no-snapshot.patch ];
|
|
||||||
|
|
||||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
|
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
|
||||||
|
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
|
|
||||||
index a1810cc..da2b645 100644
|
|
||||||
--- a/mk/support/pkg/v8.sh
|
|
||||||
+++ b/mk/support/pkg/v8.sh
|
|
||||||
@@ -155,7 +155,7 @@ pkg_install () {
|
|
||||||
if [[ "$arch" = "ppc64" ]]; then
|
|
||||||
arch_gypflags="$arch_gypflags -Duse_system_icu=1"
|
|
||||||
fi
|
|
||||||
- pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
|
|
||||||
+ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1
|
|
||||||
for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
|
|
||||||
name=`basename $lib`
|
|
||||||
cp $lib "$install_dir/lib/${name/.$arch/}"
|
|
||||||
@@ -168,7 +168,7 @@ pkg_link-flags () {
|
|
||||||
# These are the necessary libraries recommended by the docs:
|
|
||||||
# https://developers.google.com/v8/get_started#hello
|
|
||||||
if [[ "$ARCH" != "ppc64le" ]]; then
|
|
||||||
- for lib in libv8_{base,libbase,snapshot,libplatform}; do
|
|
||||||
+ for lib in libv8_{base,libbase,nosnapshot,libplatform}; do
|
|
||||||
echo "$install_dir/lib/$lib.a"
|
|
||||||
done
|
|
||||||
for lib in libicu{i18n,uc,data}; do
|
|
@ -16732,6 +16732,7 @@ in
|
|||||||
restya-board = callPackage ../servers/web-apps/restya-board { };
|
restya-board = callPackage ../servers/web-apps/restya-board { };
|
||||||
|
|
||||||
rethinkdb = callPackage ../servers/nosql/rethinkdb {
|
rethinkdb = callPackage ../servers/nosql/rethinkdb {
|
||||||
|
stdenv = clangStdenv;
|
||||||
libtool = darwin.cctools;
|
libtool = darwin.cctools;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user