From c7804cb0e56f68c9944f4a4b5bbea67b6a4556fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Nov 2005 05:49:28 +0000
Subject: [PATCH] * Idem.

svn path=/nixpkgs/trunk/; revision=4324
---
 .../networking/browsers/{firefox-1.5beta => firefox}/builder.sh | 0
 .../browsers/{firefox-1.5beta => firefox}/default.nix           | 0
 .../browsers/{firefox-1.5beta => firefox}/writable-copies.patch | 0
 pkgs/system/all-packages-generic.nix                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/networking/browsers/{firefox-1.5beta => firefox}/builder.sh (100%)
 rename pkgs/applications/networking/browsers/{firefox-1.5beta => firefox}/default.nix (100%)
 rename pkgs/applications/networking/browsers/{firefox-1.5beta => firefox}/writable-copies.patch (100%)

diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh
rename to pkgs/applications/networking/browsers/firefox/builder.sh
diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-1.5beta/default.nix
rename to pkgs/applications/networking/browsers/firefox/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch b/pkgs/applications/networking/browsers/firefox/writable-copies.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch
rename to pkgs/applications/networking/browsers/firefox/writable-copies.patch
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 17673943d093..f00304e49a10 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1586,7 +1586,7 @@ rec {
     inherit (xlibs) libXi;
   };
 
-  firefox = (import ../applications/networking/browsers/firefox-1.5beta) {
+  firefox = (import ../applications/networking/browsers/firefox) {
     inherit fetchurl stdenv pkgconfig perl zip;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;