diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
deleted file mode 100644
index 30fe15c6e483..000000000000
--- a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Chris Coulson <chrisccoulson@ubuntu.com>
-# Date 1306390403 -7200
-# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
-# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e
-Bug 639554 - Install sdk/bin with make install. r=bsmedberg
-
-diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
---- a/toolkit/mozapps/installer/packager.mk
-+++ b/toolkit/mozapps/installer/packager.mk
-@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard
- $(NSINSTALL) -D $(DESTDIR)$(includedir)
- (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(includedir) && tar -xf -)
- $(NSINSTALL) -D $(DESTDIR)$(idldir)
- (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(idldir) && tar -xf -)
- # SDK directory is the libs + a bunch of symlinks
- $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
-+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
- if test -f $(DIST)/include/xpcom-config.h; then \
- $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
- fi
- (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
-+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
- $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
- ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
- ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
- ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
- ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
- endif # INSTALL_SDK
-
- make-sdk:
-
diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix
deleted file mode 100644
index df205a64fb5c..000000000000
--- a/pkgs/applications/networking/browsers/firefox/6.0.nix
+++ /dev/null
@@ -1,168 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
- # of "Shiretoko" or whatever, 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
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
- firefoxVersion = "6.0.2";
-
- xulVersion = "6.0.2"; # 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 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
- };
-
-
- commonConfigureFlags =
- [ "--enable-optimize"
- "--disable-debug"
- "--enable-strip"
- "--with-system-jpeg"
- "--with-system-zlib"
- "--with-system-bz2"
- "--with-system-nspr"
- # "--with-system-nss"
- # "--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"
- "--disable-crashreporter"
- "--disable-tests"
- "--disable-necko-wifi" # maybe we want to enable this at some point
- "--disable-installer"
- "--disable-updater"
- ];
-
-
- xulrunner = stdenv.mkDerivation rec {
- name = "xulrunner-${xulVersion}";
-
- inherit src;
-
- patches = [ ./6.0-install-sdk-bin.patch ];
-
- 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
- alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
- xlibs.libXScrnSaver xlibs.scrnsaverproto
- xlibs.libXext xlibs.xextproto sqlite
- ];
-
- configureFlags =
- [ "--enable-application=xulrunner"
- "--disable-javaxpcom"
- ] ++ commonConfigureFlags;
-
- enableParallelBuilding = true;
-
- # Hack to work around make's idea of -lbz2 dependency
- preConfigure =
- ''
- find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
- stdenv.lib.concatStringsSep ":"
- (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
- }' ';'
- '';
-
- # !!! Temporary hacks.
- preBuild =
- ''
- ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
- export NIX_ENFORCE_PURITY=
- '';
-
- installFlags = "SKIP_GRE_REGISTRATION=1";
-
- postInstall = ''
- # 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 -f $out/bin/run-mozilla.sh
- ''; # */
-
- meta = {
- description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.org/firefox/;
- };
-
- passthru = { inherit gtk; version = xulVersion; };
- };
-
-
- firefox = stdenv.mkDerivation rec {
- name = "firefox-${firefoxVersion}";
-
- inherit src;
-
- enableParallelBuilding = true;
-
- buildInputs =
- [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
- dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
- xlibs.pixman yasm mesa sqlite
- ];
-
- propagatedBuildInputs = [xulrunner];
-
- configureFlags =
- [ "--enable-application=browser"
- "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
- "--enable-chrome-format=jar"
- ]
- ++ commonConfigureFlags
- ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
- # Hack to work around make's idea of -lbz2 dependency
- preConfigure =
- ''
- find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
- stdenv.lib.concatStringsSep ":"
- (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
- }' ';'
- '';
-
- postInstall =
- ''
- ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
- ''; # */
-
- meta = {
- description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.org/firefox/;
- };
-
- passthru = {
- inherit gtk xulrunner nspr;
- isFirefox3Like = true;
- };
- };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix
index f68070565290..8e60fa6bbb75 100644
--- a/pkgs/applications/networking/browsers/firefox/8.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/8.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
- firefoxVersion = "8.0b1";
+ firefoxVersion = "8.0";
xulVersion = "8.0"; # this attribute is used by other packages
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
- sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
+ sha1 = "843cf4ad70d2fc4b16654c3ff9b080d3eb357452";
};
commonConfigureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f956b6f2c623..2d82e0e75265 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6636,13 +6636,6 @@ let
firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; };
- firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix {
- inherit (gtkLibs) gtk pango;
- inherit (gnome) libIDL;
- };
-
- firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; };
-
firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
@@ -6650,11 +6643,13 @@ let
firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; };
- firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
+ firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
+ firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
+
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer10;