diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-09-13 22:42:21 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-09-13 22:50:47 -0700 |
| commit | f4e8f18c19caa25912db85ab1732bfd7e788e1ee (patch) | |
| tree | 6d22f6086114087dcbbd736636b50c6fa78cd1e7 /pkgs | |
| parent | cd83ae0ad7eccb2b5f6cf8966c51db4dc53e8b36 (diff) | |
| download | nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar.gz nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar.bz2 nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar.lz nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar.xz nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.tar.zst nixpkgs-f4e8f18c19caa25912db85ab1732bfd7e788e1ee.zip | |
v8: 3.26.8 -> 3.26.31.15
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch | 27 |
2 files changed, 10 insertions, 34 deletions
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4c86de7fb56..fda32a7ddbd 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -8,17 +8,22 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "3.26.8"; + version = "3.26.31.15"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + "${name}.tar.bz2"; - sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz"; + sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l"; }; + patchPhase = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + ''; + configurePhase = '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - ${gyp}/bin/gyp \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ -f make \ --generator-output="out" \ -Dflock_index=0 \ @@ -26,9 +31,7 @@ stdenv.mkDerivation rec { -Duse_system_icu=1 \ -Dconsole=readline \ -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} \ - --depth=. -Ibuild/standalone.gypi \ - build/all.gyp + -Dv8_target_arch=${arch} ''; nativeBuildInputs = [ which ]; @@ -60,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's open source JavaScript engine"; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch deleted file mode 100644 index 3bc0fff4d50..00000000000 --- a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 -From: Timothy J Fontaine <tjfontaine@gmail.com> -Date: Thu, 23 May 2013 13:57:59 -0700 -Subject: [PATCH] v8: fix GetLocalizedMessage usage - -As is the backport of the abort on uncaught exception wouldn't compile -because we it was passing in `this` when it was unnecessary. ---- - deps/v8/src/isolate.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/isolate.cc b/src/isolate.cc -index 04a438b..5a5293e 100644 ---- a/src/isolate.cc -+++ b/src/isolate.cc -@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { - (report_exception || can_be_caught_externally)) { - fatal_exception_depth++; - fprintf(stderr, "%s\n\nFROM\n", -- *MessageHandler::GetLocalizedMessage(this, message_obj)); -+ *MessageHandler::GetLocalizedMessage(message_obj)); - PrintCurrentStackTrace(stderr); - OS::Abort(); - } --- -1.8.1.6 - |