From fbe70b6ab5c6cf3ea800a87693b3c6752a4c893d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jul 2009 13:57:57 +0000 Subject: [PATCH] * Delete Firefox 3.1. svn path=/nixpkgs/trunk/; revision=16141 --- .../networking/browsers/firefox-3/3.1.nix | 84 ---------------- .../browsers/firefox-3/xulrunner-3.1.nix | 96 ------------------- pkgs/top-level/all-packages.nix | 21 ---- 3 files changed, 201 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox-3/3.1.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix diff --git a/pkgs/applications/networking/browsers/firefox-3/3.1.nix b/pkgs/applications/networking/browsers/firefox-3/3.1.nix deleted file mode 100644 index ef40ac0c7d3e..000000000000 --- a/pkgs/applications/networking/browsers/firefox-3/3.1.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2 -, freetype, fontconfig, xulrunner, alsaLib, autoconf - -, # 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-3.1b2"; - - src = fetchurl { - url = ftp://ftp.mozilla.org/pub/firefox/releases/3.1b2/source/firefox-3.1b2-source.tar.bz2; - sha256 = "1mqy7q4bfw8iphlmzvymqfki8r4zzynyyy6z6gws4qqx9ry42jqs"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig alsaLib - autoconf - ]; - - propagatedBuildInputs = [xulrunner]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - preBuild = '' - cd nsprpub - autoconf - ./configure - make - cd .. - ''; - - configureFlags = [ - "--enable-application=browser" - "--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" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ]; - - postInstall = '' - # Strip some more stuff. - strip -S $out/lib/*/* || true - - 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; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix deleted file mode 100644 index 0fb5027e31ee..000000000000 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, autoconf - -, # 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 -}: - -let - - version = "1.9.1b2"; # this attribute is used by other packages - -in - -stdenv.mkDerivation { - name = "xulrunner-${version}"; - - src = fetchurl { - url = ftp://ftp.mozilla.org/pub/firefox/releases/3.1b2/source/firefox-3.1b2-source.tar.bz2; - sha256 = "1mqy7q4bfw8iphlmzvymqfki8r4zzynyyy6z6gws4qqx9ry42jqs"; - }; - - 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 autoconf - ]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - configureFlags = [ - "--enable-application=xulrunner" - "--disable-javaxpcom" - "--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" - ]; - - installFlags = [ - "SKIP_GRE_REGISTRATION=1" - ]; - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Firefox 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; }; -} - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10d4304c6513..edaa456a866f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6270,27 +6270,6 @@ let #enableOfficialBranding = true; }); - firefox3_1 = lowPrio (import ../applications/networking/browsers/firefox-3/3.1.nix { - inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo - python dbus dbus_glib freetype fontconfig bzip2; - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - inherit alsaLib; - #enableOfficialBranding = true; - xulrunner = xulrunner3_1; - autoconf = autoconf213; - }); - - xulrunner3_1 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner-3.1.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; - inherit alsaLib; - autoconf = autoconf213; - #enableOfficialBranding = true; - }); - firefox3_5 = lowPrio (import ../applications/networking/browsers/firefox-3/3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo python dbus dbus_glib freetype fontconfig bzip2;