Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-05-23 16:04:32 -04:00
parent dddf921b51
commit 5e064cc871
2 changed files with 34 additions and 3 deletions

View File

@ -5,18 +5,22 @@ assert readline != null;
let
system = stdenv.system;
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
version = "3.11.10.22";
version = "3.14.5.9";
in
assert arch != "";
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "v8-${version}";
src = fetchsvn {
url = "http://v8.googlecode.com/svn/tags/${version}";
sha256 = "1bm3hg4pa17xvs8s895bwklxpaihl3f3vzghdg55s1wd0y4dj96j";
sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr";
name = "v8-${version}-src";
};
patches = [ ./fix-GetLocalizedMessage-usage.patch ];
configurePhase = ''
mkdir build/gyp
ln -sv ${gyp}/bin/gyp build/gyp/gyp

View File

@ -0,0 +1,27 @@
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