From adb988d57c189c7e4385dcdcff2efd1f7092af2b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Jul 2011 16:37:44 +0000 Subject: [PATCH] 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 --- pkgs/top-level/all-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33185b684716..e4d76baec683 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;