summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-03-17 22:15:46 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-04-19 03:58:38 +0200
commit2f23f57b28fc7cb41bec51250e4566e969e3aa2c (patch)
tree064fb6980ef242844ae50cf1575b7886d934c11f /pkgs
parent8ddc86d6e486e577afb746c55cbec181f372f6b5 (diff)
downloadnixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar.gz
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar.bz2
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar.lz
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar.xz
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.tar.zst
nixlib-2f23f57b28fc7cb41bec51250e4566e969e3aa2c.zip
chromium: Build beta/dev with v8 from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5c0d44f05a33..292b99f92eb3 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt
+, libpng, libxml2, libxslt, v8
 , xdg_utils, yasm, zlib
 , libusb1, libexif, pciutils
 
@@ -134,13 +134,13 @@ let
     use_system_libwebp = false; # http://crbug.com/133161
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = false;
+    use_system_v8 = !versionOlder src.version "34.0.0.0";
   };
 
   defaultDependencies = [
     bzip2 flac speex icu libopus
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt
+    libpng libxml2 libxslt v8
     xdg_utils yasm zlib
     libusb1 libexif
   ];