Author: shlevy
Date: Fri Aug 19 12:13:48 2011
New Revision: 28679
URL: https://svn.nixos.org/websvn/nix/?rev=28679&sc=1
Log:
Use pkgs instead of recursive attributes
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 Fri Aug 19 11:22:30
2011 (r28678)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 19 12:13:48
2011 (r28679)
@@ -2591,7 +2591,7 @@
inherit stdenv application launcher xulrunner;
};
- xulrunner = firefoxPkgs.xulrunner;
+ xulrunner = pkgs.firefoxPkgs.xulrunner;
### DEVELOPMENT / MISC
@@ -6454,11 +6454,11 @@
filelight = if pkgs.kde4.kdeutils ? filelight then
pkgs.kde4.kdeutils.filelight
else newScope pkgs.kde4 ../applications/misc/filelight { };
- firefox = firefoxPkgs.firefox;
+ firefox = pkgs.firefoxPkgs.firefox;
- firefoxWrapper = wrapFirefox firefox "firefox" "";
+ firefoxWrapper = wrapFirefox pkgs.firefox "firefox" "";
- firefoxPkgs = firefox50Pkgs;
+ firefoxPkgs = pkgs.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
