From 0591ccedc0ef9115dda10446e6f4c72dbe62b56a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jun 2008 07:39:01 +0000
Subject: [PATCH] * firefox -> firefox-2.

svn path=/nixpkgs/trunk/; revision=12132
---
 .../networking/browsers/{firefox => firefox-2}/builder.sh       | 0
 .../networking/browsers/{firefox => firefox-2}/default.nix      | 0
 .../browsers/{firefox => firefox-2}/writable-copies.patch       | 0
 .../networking/browsers/{firefox => firefox-2}/xlibs.patch      | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/networking/browsers/{firefox => firefox-2}/builder.sh (100%)
 rename pkgs/applications/networking/browsers/{firefox => firefox-2}/default.nix (100%)
 rename pkgs/applications/networking/browsers/{firefox => firefox-2}/writable-copies.patch (100%)
 rename pkgs/applications/networking/browsers/{firefox => firefox-2}/xlibs.patch (100%)

diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox-2/builder.sh
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/builder.sh
rename to pkgs/applications/networking/browsers/firefox-2/builder.sh
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox-2/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/default.nix
rename to pkgs/applications/networking/browsers/firefox-2/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox/writable-copies.patch b/pkgs/applications/networking/browsers/firefox-2/writable-copies.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/writable-copies.patch
rename to pkgs/applications/networking/browsers/firefox-2/writable-copies.patch
diff --git a/pkgs/applications/networking/browsers/firefox/xlibs.patch b/pkgs/applications/networking/browsers/firefox-2/xlibs.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/xlibs.patch
rename to pkgs/applications/networking/browsers/firefox-2/xlibs.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c792da2889a..b3271de81ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5758,7 +5758,7 @@ let pkgs = rec {
     inherit fetchurl stdenv x11 imlib2 libjpeg libpng;
   };
 
-  firefox = lowPrio (import ../applications/networking/browsers/firefox {
+  firefox = lowPrio (import ../applications/networking/browsers/firefox-2 {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;