From f9ec20d6ecf73ec33cd569633dd5b8c88cee0aa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Mar 2011 14:30:13 +0000
Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=26460

---
 pkgs/top-level/all-packages.nix | 4 +++-
 pkgs/top-level/release.nix      | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a77aad3e1da..dc5bf4a8ba5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5996,12 +5996,14 @@ let
     inherit (gnome) libIDL;
   };
 
+  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+
   firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
+  firefox40Wrapper = lowPrio (wrapFirefox firefox40Pkgs.firefox "firefox" "");
 
   flac = callPackage ../applications/audio/flac { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0dfbccfb167..e8afa9bcb3b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -380,9 +380,8 @@ with (import ./release-lib.nix);
     jdee = linux;
   };
 
-  firefox36Pkgs = {
-    firefox = linux;
-  };
+  firefox36Pkgs.firefox = linux;
+  firefox40Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;