diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-15 17:04:11 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-15 17:04:11 +0000 |
commit | 9012efbaef9d51499b214fc4e53e19877681843d (patch) | |
tree | d1470a3d89549810895a5ef0bcc7c5f8adaea312 /pkgs/applications/networking/browsers/firefox | |
parent | 5c9484028fc96fdf971169f9501f214d2c760afa (diff) | |
download | nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar.gz nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar.bz2 nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar.lz nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar.xz nixlib-9012efbaef9d51499b214fc4e53e19877681843d.tar.zst nixlib-9012efbaef9d51499b214fc4e53e19877681843d.zip |
* Make the Firefox build more like xulrunner (e.g., don't using
.mozconfig). * Optionally build Firefox with official branding (so that it calls itself "Firefox" instead of "Deer Park"). This should not be turned on for the channel! svn path=/nixpkgs/trunk/; revision=4817
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/builder.sh | 30 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 26 |
2 files changed, 25 insertions, 31 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh index b2f2136272dc..8192a2333667 100644 --- a/pkgs/applications/networking/browsers/firefox/builder.sh +++ b/pkgs/applications/networking/browsers/firefox/builder.sh @@ -1,34 +1,11 @@ source $stdenv/setup -preConfigure=preConfigure -preConfigure() { - cat > .mozconfig <<EOF -source \$topsrcdir/browser/config/mozconfig -ac_add_options --prefix=$out -ac_add_options --enable-optimize -ac_add_options --disable-debug -ac_add_options --enable-xft -ac_add_options --disable-freetype2 -#ac_add_options --enable-swg -ac_add_options --enable-strip -ac_add_options --enable-default-toolkit=gtk2 -#ac_add_options --disable-shared -#ac_add_options --enable-static -#ac_add_options --with-system-jpeg -#ac_add_options --with-system-png -#ac_add_options --with-system-zlib -EOF -} - postInstall=postInstall postInstall() { # Strip some more stuff strip -S $out/lib/*/* || true - # We don't need this (do we?) -# rm -rf $out/include - # This fixes starting Firefox when there already is a running # instance. The `firefox' wrapper script actually expects to be # in the same directory as `run-mozilla.sh', apparently. @@ -36,18 +13,13 @@ postInstall() { mv firefox ../lib/firefox-*/ ln -s ../lib/firefox-*/firefox . - # Register extension etc. + # Register extensions etc. echo "running firefox -register..." (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false echo "running regxpcom..." (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false -# echo "running regchrome..." -# (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false - } -makeFlags="-f client.mk build" - genericBuild diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a620a2b39b37..5174717f0404 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,6 +1,12 @@ -{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}: +{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi -# !!! assert libIDL.glib == gtk.glib; +, # If you want the resulting program to call itself "Firefox" instead + # of "Deer Park", enable this option. However, those binaries may + # not be distributed without permission from the Mozilla Foundation, + # see http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false + +}: stdenv.mkDerivation { name = "firefox-1.5.0.1"; @@ -15,4 +21,20 @@ stdenv.mkDerivation { inherit gtk; patches = [./writable-copies.patch]; + + configureFlags = [ + "--enable-application=browser" + "--enable-optimize" + "--disable-debug" + "--enable-xft" + "--disable-freetype2" + "--enable-swg" + "--enable-strip" + "--enable-default-toolkit=gtk2" + "--with-system-jpeg" + "--with-system-png" + "--with-system-zlib" + ] + ++ (if enableOfficialBranding then ["--enable-official-branding"] else []); + } |