From 9b2769b0611645e25046eb996896ae65f360c4f6 Mon Sep 17 00:00:00 2001
From: Matthias Totschnig <matthias@totschnig.org>
Date: Fri, 29 May 2020 12:00:37 +0200
Subject: rethinkdb: use clangStdenv

And remove patch working around a GCC bug.
---
 pkgs/servers/nosql/rethinkdb/default.nix          |  3 ---
 pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch | 22 ----------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch

(limited to 'pkgs/servers/nosql')

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 80d287699ac0..40ffddd4f105 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
     sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b";
   };
 
-  # Don't make V8 snapshots, as those segfault.
-  patches = [ ./v8-no-snapshot.patch ];
-
   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
 
diff --git a/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch b/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch
deleted file mode 100644
index e9ef5438d6b8..000000000000
--- a/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch
+++ /dev/null
@@ -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
-- 
cgit 1.4.1