From a6fdbe5192c537c3bdd18e4a78ace085cc01e244 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 13 Apr 2011 20:52:01 +0000 Subject: [PATCH] Change the default Firefox to 4.0 Until someone complains, that is svn path=/nixpkgs/trunk/; revision=26835 --- pkgs/top-level/all-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d761c8bfa786..45e648d8381e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2444,7 +2444,7 @@ let xulrunnerWrapper = {application, launcher}: import ../development/interpreters/xulrunner/wrapper { inherit stdenv application launcher; - xulrunner = firefox36Pkgs.xulrunner; + xulrunner = firefox40Pkgs.xulrunner; }; @@ -6087,8 +6087,9 @@ let filelight = newScope pkgs.kde4 ../applications/misc/filelight { }; - firefox = firefox36Pkgs.firefox; - firefoxWrapper = firefox36Wrapper; + firefox = firefox40Pkgs.firefox; + + firefoxWrapper = firefox40Wrapper; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; @@ -6102,7 +6103,7 @@ let inherit (gnome) libIDL; }; - firefox40Wrapper = lowPrio (wrapFirefox firefox40Pkgs.firefox "firefox" ""); + firefox40Wrapper = wrapFirefox firefox40Pkgs.firefox "firefox" ""; flac = callPackage ../applications/audio/flac { };