diff options
| author | Matthias Totschnig <matthias@totschnig.org> | 2020-05-29 12:00:37 +0200 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-08-21 15:44:52 -0700 |
| commit | 9b2769b0611645e25046eb996896ae65f360c4f6 (patch) | |
| tree | f8ad07b32310bcf9ad3622dd6e5bb7836660b517 /pkgs/servers | |
| parent | 8025e4ffe445d97eb9377e4d66441cebcca65ca0 (diff) | |
| download | nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar.gz nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar.bz2 nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar.lz nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar.xz nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.tar.zst nixpkgs-9b2769b0611645e25046eb996896ae65f360c4f6.zip | |
rethinkdb: use clangStdenv
And remove patch working around a GCC bug.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch | 22 |
2 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 80d287699ac..40ffddd4f10 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 e9ef5438d6b..00000000000 --- 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 |