public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pkgs instead of recursive attributes

Browse Source 
svn path=/nixpkgs/trunk/; revision=28679
This commit is contained in:
Shea Levy 2011-08-19 12:13:48 +00:00
parent 3a885c86c7
commit af702547cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -2591,7 +2591,7 @@ let
inherit stdenv application launcher xulrunner; inherit stdenv application launcher xulrunner;
}; };
xulrunner = firefoxPkgs.xulrunner; xulrunner = pkgs.firefoxPkgs.xulrunner;
### DEVELOPMENT / MISC ### DEVELOPMENT / MISC
@ -6454,11 +6454,11 @@ let
filelight = if pkgs.kde4.kdeutils ? filelight then pkgs.kde4.kdeutils.filelight filelight = if pkgs.kde4.kdeutils ? filelight then pkgs.kde4.kdeutils.filelight
else newScope pkgs.kde4 ../applications/misc/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 { firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;