From af702547cd385ebfcef2cc84e71a2a2ee32fba7f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 19 Aug 2011 12:13:48 +0000 Subject: [PATCH] Use pkgs instead of recursive attributes svn path=/nixpkgs/trunk/; revision=28679 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e0acfade5d..6715f989fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2591,7 +2591,7 @@ let inherit stdenv application launcher xulrunner; }; - xulrunner = firefoxPkgs.xulrunner; + xulrunner = pkgs.firefoxPkgs.xulrunner; ### DEVELOPMENT / MISC @@ -6454,11 +6454,11 @@ let 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;