Introduce the 'firefoxPkgs' attribute so that only one change needs to be made when changing default firefox version

A quick test showed that this change does not change the hash for building pkgs.firefoxWrapper

svn path=/nixpkgs/trunk/; revision=27974
This commit is contained in:
Shea Levy 2011-07-27 16:37:44 +00:00
parent 22135b319b
commit adb988d57c

View File

@ -2502,10 +2502,10 @@ let
xulrunnerWrapper = {application, launcher}:
import ../development/interpreters/xulrunner/wrapper {
inherit stdenv application launcher;
xulrunner = firefox50Pkgs.xulrunner;
xulrunner = firefoxPkgs.xulrunner;
};
xulrunner = firefox50Pkgs.xulrunner;
xulrunner = firefoxPkgs.xulrunner;
### DEVELOPMENT / MISC
@ -6297,9 +6297,11 @@ let
filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
firefox = firefox50Pkgs.firefox;
firefox = firefoxPkgs.firefox;
firefoxWrapper = firefox50Wrapper;
firefoxWrapper = wrapFirefox firefoxPkgs.firefox "firefox" "";
firefoxPkgs = firefox50Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango;