public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use browser/config/mozconfig to get a more "standard" Firefox

Browse Source 
build.  The find bar now works properly (don't know why).
* Delete developer stuff (header files) after installation.

svn path=/nixpkgs/trunk/; revision=1463
This commit is contained in:
Eelco Dolstra 2004-09-19 14:13:24 +00:00
parent dde13d1ada
commit ee672a7456
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/browsers/firefox/builder.sh
View File

@ -1,30 +1,27 @@
. $stdenv/setup . $stdenv/setup
preConfigure=preConfigure
preConfigure() { preConfigure() {
cat > .mozconfig <<EOF cat > .mozconfig <<EOF
export MOZ_PHOENIX=1 . \$topsrcdir/browser/config/mozconfig
mk_add_options MOZ_PHOENIX=1 ac_add_options --prefix=$out
ac_add_options --enable-crypto ac_add_options --enable-optimize
ac_add_options --disable-tests
ac_add_options --disable-debug 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-xft
ac_add_options --enable-swg ac_add_options --enable-swg
ac_add_options --enable-strip ac_add_options --enable-strip
ac_add_options --enable-default-toolkit=gtk2 ac_add_options --enable-default-toolkit=gtk2
ac_add_options --enable-single-profile #ac_add_options --disable-shared
#ac_add_options --enable-static
EOF EOF
echo "ac_add_options --prefix=$out" >> .mozconfig
} }
preConfigure=preConfigure
makeFlags="-f client.mk build" makeFlags="-f client.mk build"
genericBuild genericBuild
# Strip some more stuff
strip -S $out/lib/*/* || true
# We don't need this (do we?)
rm -rf $out/include

4
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -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 assert pkgconfig != null && gtk != null && perl != null
&& zip != null && libIDL != null; && zip != null && libIDL != null;
@ -14,5 +14,5 @@ stdenv.mkDerivation {
md5 = "b81ebc5f01448313add23ed44c47cf5e"; md5 = "b81ebc5f01448313add23ed44c47cf5e";
}; };
buildInputs = [pkgconfig gtk perl zip libIDL]; buildInputs = [pkgconfig gtk perl zip libIDL libXi];
} }

1
pkgs/system/all-packages-generic.nix
View File

@ -749,6 +749,7 @@ rec {
inherit fetchurl stdenv pkgconfig perl zip; inherit fetchurl stdenv pkgconfig perl zip;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (xlibs) libXi;
}; };
thunderbird = thunderbird =