Author: shlevy
Date: Wed Jul 27 16:37:44 2011
New Revision: 27974
URL: https://svn.nixos.org/websvn/nix/?rev=27974&sc=1
Log:
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
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 27 16:07:20
2011 (r27973)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jul 27 16:37:44
2011 (r27974)
@@ -2502,10 +2502,10 @@
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 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
