about summary refs log tree commit diff
path: root/pkgs/development/web
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-04-21 09:50:50 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-04-21 09:50:50 +0200
commitcdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d (patch)
tree3a81976601f130f824a65fc66a6f724dbe3dd855 /pkgs/development/web
parent5701e4e15aa5876e0dcfa5079f76a80d9a5afac8 (diff)
parent18234b676821db85f6d94777c90303e513f2f110 (diff)
downloadnixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.gz
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.bz2
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.lz
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.xz
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.zst
nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.zip
Merge branch 'chromium-refactor', closes #1798.
This implements some longstanding work of getting the Chromium
derivation more modular. Unfortunately, I didn't manage to decrease the
compile time, which was one of the primary goal for doing the refactor.
A main reason this didn't work out well was the fact that most bundled
libraries are so heavily patched that it's not possible within a limited
time frame to decouple it from the main derivation.

However, it should now be easier to build other derivations that build
upon Chromium, like libcef. Also, it finally adds support for the
non-free PepperAPI Flash and PDF plugins and support for fetching the
corresponding versions through the updater.
Diffstat (limited to 'pkgs/development/web')
-rw-r--r--pkgs/development/web/nodejs/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 062d7f4ec066..3b1b64679722 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
+{ stdenv, fetchurl, openssl, python, zlib, v8_3_14, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -10,7 +10,7 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit v8 openssl zlib http-parser;
+    inherit v8_3_14 openssl zlib http-parser;
     cares = c-ares;
   };