From 9f45c2cbbab6ac763860c1b5d58c36a2208685a5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 21:53:29 +0100
Subject: [PATCH] chromium: Prepare for building the -lite package.

We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7ae83186567a..5c0d44f05a33 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, ninja, which
 
 # default dependencies
-, bzip2, flac, speex
-, libevent, expat, libjpeg
+, bzip2, flac, speex, icu, libopus
+, libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt
 , xdg_utils, yasm, zlib
 , libusb1, libexif, pciutils
@@ -117,8 +117,9 @@ let
     use_system_libexif = true;
     use_system_libjpeg = true;
     use_system_libpng = false; # PNG dlopen() version conflict
-    use_system_libusb = true;
     use_system_libxml = true;
+    use_system_opus = true;
+    use_system_snappy = true;
     use_system_speex = true;
     use_system_ssl = useOpenSSL;
     use_system_stlport = true;
@@ -128,7 +129,8 @@ let
     use_system_protobuf = true;
 
     use_system_harfbuzz = false;
-    use_system_icu = false;
+    use_system_icu = false; # Doesn't support ICU 52 yet.
+    use_system_libusb = false; # http://crbug.com/266149
     use_system_libwebp = false; # http://crbug.com/133161
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
@@ -136,8 +138,8 @@ let
   };
 
   defaultDependencies = [
-    bzip2 flac speex
-    libevent expat libjpeg
+    bzip2 flac speex icu libopus
+    libevent expat libjpeg snappy
     libpng libxml2 libxslt
     xdg_utils yasm zlib
     libusb1 libexif
@@ -230,6 +232,7 @@ in stdenv.mkDerivation rec {
   });
 
   configurePhase = ''
+    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
     python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
   '';