diff options
| author | Shea Levy <shea@shealevy.com> | 2011-08-19 12:13:48 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-08-19 12:13:48 +0000 |
| commit | af702547cd385ebfcef2cc84e71a2a2ee32fba7f (patch) | |
| tree | e8ae538615294ae2fed2082bf62f55c8f3344dda /pkgs | |
| parent | 3a885c86c7a3e70b8f0cf8b961f315e7ce1479d4 (diff) | |
| download | nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar.gz nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar.bz2 nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar.lz nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar.xz nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.tar.zst nixlib-af702547cd385ebfcef2cc84e71a2a2ee32fba7f.zip | |
Use pkgs instead of recursive attributes
svn path=/nixpkgs/trunk/; revision=28679
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e0acfade5dd..6715f989fbf0 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; |