mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
v8: 3.26.8 -> 3.26.31.15
This commit is contained in:
parent
cd83ae0ad7
commit
f4e8f18c19
|
@ -8,17 +8,22 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "v8-${version}";
|
name = "v8-${version}";
|
||||||
version = "3.26.8";
|
version = "3.26.31.15";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
|
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
|
||||||
+ "${name}.tar.bz2";
|
+ "${name}.tar.bz2";
|
||||||
sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz";
|
sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patchPhase = ''
|
||||||
|
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
|
||||||
|
'';
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
|
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
|
||||||
${gyp}/bin/gyp \
|
PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
|
||||||
|
build/gyp_v8 \
|
||||||
-f make \
|
-f make \
|
||||||
--generator-output="out" \
|
--generator-output="out" \
|
||||||
-Dflock_index=0 \
|
-Dflock_index=0 \
|
||||||
|
@ -26,9 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
-Duse_system_icu=1 \
|
-Duse_system_icu=1 \
|
||||||
-Dconsole=readline \
|
-Dconsole=readline \
|
||||||
-Dcomponent=shared_library \
|
-Dcomponent=shared_library \
|
||||||
-Dv8_target_arch=${arch} \
|
-Dv8_target_arch=${arch}
|
||||||
--depth=. -Ibuild/standalone.gypi \
|
|
||||||
build/all.gyp
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ which ];
|
nativeBuildInputs = [ which ];
|
||||||
|
@ -60,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Google's open source JavaScript engine";
|
description = "Google's open source JavaScript engine";
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = with platforms; linux ++ darwin;
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
Loading…
Reference in a new issue