From 22f5045bdeb04be163d3b732f1e129d5c5d0e5b9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 19 Jun 2012 06:56:50 +0200
Subject: [PATCH] chromium: Use system libraries whenever possible.

There are still some libraries left, which we either need to patch or provide
more recent versions. Plus we're going to use openssl, as libnss doesn't want to
do proper SSL (let's debug this later).
---
 .../networking/browsers/chromium/default.nix  | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 24de7bc2e91..872c2230acd 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,6 +1,14 @@
 { stdenv, fetchurl, fetchsvn, makeWrapper, which
+
+# default dependencies
+, bzip2, ffmpeg, flac #, harfbuzz
+, icu, libevent, expat, libjpeg
+, libpng, libwebp, libxml2, libxslt #, skia
+, speex, sqlite, openssl #, stlport
+, v8, xdg_utils, yasm, zlib
+
 , python, perl, pkgconfig
-, nspr, nss, udev, bzip2
+, nspr, udev
 , utillinux, alsaLib
 , gcc, bison, gperf
 , krb5
@@ -24,6 +32,37 @@ let
     toFlag = key: value: "-D${key}=${sanitize value}";
   in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
+  gypFlagsUseSystemLibs = {
+    use_system_bzip2 = true;
+    use_system_ffmpeg = false; # FIXME: libavformat...
+    use_system_flac = true;
+    use_system_harfbuzz = false; # TODO
+    use_system_icu = false; # FIXME: wrong version!
+    use_system_libevent = true;
+    use_system_libexpat = true;
+    use_system_libjpeg = true;
+    use_system_libpng = true;
+    use_system_libwebp = false; # See chromium issue #133161
+    use_system_libxml = true;
+    use_system_skia = false; # TODO
+    use_system_speex = true;
+    use_system_sqlite = false; # FIXME
+    use_system_ssl = true;
+    use_system_stlport = true;
+    use_system_v8 = false; # TODO...
+    use_system_xdg_utils = true;
+    use_system_yasm = true;
+    use_system_zlib = true;
+  };
+
+  defaultDependencies = [
+    bzip2 ffmpeg flac # harfbuzz
+    icu libevent expat libjpeg
+    libpng libwebp libxml2 libxslt # skia
+    speex sqlite openssl # stlport
+    v8 xdg_utils yasm zlib
+  ];
+
 in stdenv.mkDerivation rec {
   name = "chromium-${version}";
 
@@ -34,10 +73,10 @@ in stdenv.mkDerivation rec {
     sha256 = sourceInfo.sha256;
   };
 
-  buildInputs = [
+  buildInputs = defaultDependencies ++ [
     which makeWrapper
     python perl pkgconfig
-    nspr nss udev bzip2
+    nspr udev
     utillinux alsaLib
     gcc bison gperf
     krb5
@@ -49,12 +88,13 @@ in stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch;
 
-  gypFlags = mkGypFlags ({
+  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
     linux_use_gold_binary = false;
     linux_use_gold_flags = false;
     proprietary_codecs = false;
     use_gnome_keyring = gnomeKeyringSupport;
     disable_nacl = !naclSupport;
+    use_openssl = true;
     selinux = useSELinux;
     use_cups = false;
   } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") {
@@ -65,29 +105,6 @@ in stdenv.mkDerivation rec {
 
   buildType = "Release";
 
-  /* TODO:
-  use_system_bzip2 = true;
-  use_system_ffmpeg = true;
-  use_system_flac = true;
-  use_system_harfbuzz = true;
-  use_system_icu = true;
-  use_system_libevent = true;
-  use_system_libexpat = true;
-  use_system_libjpeg = true;
-  use_system_libpng = true;
-  use_system_libwebp = true;
-  use_system_libxml = true;
-  use_system_skia = true;
-  use_system_speex = true;
-  use_system_sqlite = true;
-  use_system_ssl = true;
-  use_system_stlport = true;
-  use_system_v8 = true;
-  use_system_xdg_utils = true;
-  use_system_yasm = true;
-  use_system_zlib = true;
-  */
-
   configurePhase = ''
     python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
   '';