* Firefox 1.0PR.

svn path=/nixpkgs/trunk/; revision=1395

5 files changed, 8 insertions, 54 deletions

diff --git a/pkgs/BUGS b/pkgs/BUGS
index 162d9c18e58..a071583b252 100644
--- a/pkgs/BUGS
+++ b/pkgs/BUGS
@@ -67,3 +67,6 @@ stdenv.mkDerivation {
 
 
 * Add "exit 0" at the end of configure of rte package.
+
+
+* In stdenv/nix/path.nix: remove gcc.
diff --git a/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh b/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh
deleted file mode 100644
index d4128211d4b..00000000000
--- a/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-. $stdenv/setup
-
-
-preConfigure() {
-    cat > .mozconfig <<EOF
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-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-swg
-ac_add_options --enable-strip
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-single-profile
-EOF
-    echo "ac_add_options --prefix=$out" >> .mozconfig
-}
-preConfigure=preConfigure
-
-
-makeFlags="-f client.mk build"
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix b/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix
deleted file mode 100644
index 1ba1dca03e1..00000000000
--- a/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
-}:
-
-assert pkgconfig != null && gtk != null && perl != null
-  && zip != null && libIDL != null;
-
-# !!! assert libIDL.glib == gtk.glib;
-
-stdenv.mkDerivation {
-  name = "firefox-0.9";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9/firefox-0.9-source.tar.bz2;
-    md5 = "1dda543d1245db09cea9ad7b9a44146c";
-  };
-
-  buildInputs = [pkgconfig gtk perl zip libIDL];
-}
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
index eed85b6e4c6..d4128211d4b 100644
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -18,6 +18,7 @@ ac_add_options --enable-xft
 ac_add_options --enable-swg
 ac_add_options --enable-strip
 ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-single-profile
 EOF
     echo "ac_add_options --prefix=$out" >> .mozconfig
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 7a8080ad3d5..207ed640bc3 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
-}:
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
 
 assert pkgconfig != null && gtk != null && perl != null
   && zip != null && libIDL != null;
@@ -7,12 +6,12 @@ assert pkgconfig != null && gtk != null && perl != null
 # !!! assert libIDL.glib == gtk.glib;
 
 stdenv.mkDerivation {
-  name = "firefox-0.8";
+  name = "firefox-1.0pre-PR";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
-    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
+    url = http://www.artfiles.org/mozilla.org/firefox/releases/0.10/firefox-1.0PR-source.tar.bz2;
+    md5 = "b81ebc5f01448313add23ed44c47cf5e";
   };
 
   buildInputs = [pkgconfig gtk perl zip libIDL];