JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

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