* Throw away some old versions of Firefox.

svn path=/nixpkgs/trunk/; revision=19604
This commit is contained in:
Eelco Dolstra 2010-01-21 21:14:22 +00:00
parent 16dec99054
commit b8f106abd7
5 changed files with 1 additions and 245 deletions

View File

@ -1,35 +0,0 @@
source $stdenv/setup
postInstall() {
# Strip some more stuff
strip -S $out/lib/*/* || true
# Fix some references to /bin paths in the Firefox shell script.
substituteInPlace $out/bin/firefox \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# 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.
libDir=$(cd $out/lib && ls -d firefox-*)
test -n "$libDir"
cd $out/bin
mv firefox ../lib/$libDir/
ln -s ../lib/$libDir/firefox .
# Register extensions etc.
echo "running firefox -register..."
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
echo "running regxpcom..."
(cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
# Put the Firefox icon in the right place.
ensureDir $out/lib/$libDir/chrome/icons/default
ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/
}
genericBuild

View File

@ -1,57 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
, libjpeg, libpng, zlib, cairo
, # 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-2.0.0.20";
builder = ./2.0-builder.sh;
src = fetchurl {
url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/source/firefox-2.0.0.20-source.tar.bz2;
sha1 = "16601fdbbb0a83b85fd053e76350f7da397f525e";
};
buildInputs = [
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
];
patches = [
./writable-copies.patch
# Ugh, inexplicable problem since GTK+ 2.10. Probably a Firefox
# bug, but I don't know. See
# http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html
./xlibs.patch
];
configureFlags = [
"--enable-application=browser"
"--enable-optimize"
"--disable-debug"
"--enable-xft"
"--disable-freetype2"
"--enable-svg"
"--enable-canvas"
"--enable-strip"
"--enable-default-toolkit=gtk2"
"--with-system-jpeg"
"--with-system-png"
"--with-system-zlib"
"--enable-system-cairo"
]
++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = {inherit gtk;};
}

View File

@ -1,130 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file
, # 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
}:
rec {
firefoxVersion = "3.0.17";
xulVersion = "1.9.0.17"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2";
sha1 = "e4bb7daae1699f3493936ca6739512d28c7f150f";
};
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo"
#"--enable-system-sqlite" # <-- this seems to be discouraged
"--disable-crashreporter"
];
xulrunner = stdenv.mkDerivation {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
export dontPatchELF=1
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/bin/xulrunner \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
mv xulrunner ../lib/$libDir/
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
ln -s $i $out/bin
fi;
done;
rm $out/bin/run-mozilla.sh || true
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-3.0.11";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
postInstall = ''
libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
test -n "$libDir"
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
# Register extensions etc. !!! is this needed anymore?
echo "running firefox -register..."
$out/bin/firefox -register
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = {
inherit gtk;
isFirefox3Like = true;
};
};
}

View File

@ -6876,26 +6876,6 @@ let
firefoxWrapper = firefox35Wrapper;
firefox2 = lowPrio (import ../applications/networking/browsers/firefox/2.0.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
inherit (gtkLibs) gtk;
inherit (gnome) libIDL;
inherit (xlibs) libXi;
});
firefox2Wrapper = wrapFirefox firefox2 "firefox" "";
firefox3Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.0.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs file;
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
});
firefox3 = firefox3Pkgs.firefox;
xulrunner3 = firefox3Pkgs.xulrunner;
firefox3Wrapper = wrapFirefox firefox3 "firefox" "";
firefox35Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs file alsaLib

View File

@ -156,9 +156,7 @@ in {
feh = linux;
file = all;
findutils = all;
firefox2 = linux;
firefox3 = prio 150 linux;
firefox35 = linux;
firefox35 = prio 150 linux;
flex = all;
flex2535 = all;
fontforge = linux;