From 14b6982164068d249d7ca98fe5195248f07fdc93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Oct 2005 17:25:41 +0000
Subject: [PATCH] * Add Firefox 1.5beta2 to the channel.

svn path=/nixpkgs/trunk/; revision=4076
---
 pkgs/system/all-packages-generic.nix | 8 ++++++--
 pkgs/system/populate-cache.nix       | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index bb41b483410..fef06a96231 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1429,14 +1429,14 @@ rec {
     inherit (xlibs) libXi;
   };
 
-  firefoxbeta = (import ../applications/networking/browsers/firefox-1.5beta) {
+  firefoxBeta = (import ../applications/networking/browsers/firefox-1.5beta) {
     inherit fetchurl stdenv pkgconfig perl zip;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
     inherit (xlibs) libXi;
   };
 
-  firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) {
+  wrapFirefox = firefox: (import ../applications/networking/browsers/firefox-wrapper) {
     inherit stdenv firefox;
     plugins = [
       MPlayerPlugin
@@ -1446,6 +1446,10 @@ rec {
     ];
   };
 
+  firefoxWrapper = wrapFirefox firefox;
+
+  firefoxBetaWrapper = wrapFirefox firefoxBeta;
+
   flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
     inherit fetchurl stdenv zlib;
     inherit (xlibs) libXmu;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 51eecb25b3d..1953095c1ce 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -67,6 +67,7 @@ let {
     pan
     sylpheed
     firefoxWrapper
+    firefoxBetaWrapper
     thunderbird
     lynx
     gaim