From ee672a745616cc759435929782dec56afdd0c788 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Sep 2004 14:13:24 +0000
Subject: [PATCH] * Use browser/config/mozconfig to get a more "standard"
 Firefox   build.  The find bar now works properly (don't know why). * Delete
 developer stuff (header files) after installation.

svn path=/nixpkgs/trunk/; revision=1463
---
 .../networking/browsers/firefox/builder.sh    | 27 +++++++++----------
 .../networking/browsers/firefox/default.nix   |  4 +--
 pkgs/system/all-packages-generic.nix          |  1 +
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
index d4128211d4bf..cbf2eab2c1ae 100644
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -1,30 +1,27 @@
 . $stdenv/setup
 
-
+preConfigure=preConfigure
 preConfigure() {
     cat > .mozconfig <<EOF
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
+. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-optimize=-O2
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
 ac_add_options --enable-xft
 ac_add_options --enable-swg
 ac_add_options --enable-strip
 ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-single-profile
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
 EOF
-    echo "ac_add_options --prefix=$out" >> .mozconfig
 }
-preConfigure=preConfigure
-
 
 makeFlags="-f client.mk build"
 
 genericBuild
+
+# Strip some more stuff
+strip -S $out/lib/*/* || true
+
+# We don't need this (do we?)
+rm -rf $out/include
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 207ed640bc30..af8087609b55 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
 
 assert pkgconfig != null && gtk != null && perl != null
   && zip != null && libIDL != null;
@@ -14,5 +14,5 @@ stdenv.mkDerivation {
     md5 = "b81ebc5f01448313add23ed44c47cf5e";
   };
 
-  buildInputs = [pkgconfig gtk perl zip libIDL];
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 026038e74b20..af759af8a90c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -749,6 +749,7 @@ rec {
     inherit fetchurl stdenv pkgconfig perl zip;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
+    inherit (xlibs) libXi;
   };
 
   thunderbird =