diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 9f948f29f80c..8842f876354e 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -1,59 +1,71 @@ let { - pkgs = import ./i686-linux.nix; - body = - [ - pkgs.coreutils - pkgs.findutils - pkgs.diffutils - pkgs.gnupatch - pkgs.gnused - pkgs.gnugrep - pkgs.gawk - pkgs.enscript - pkgs.gnutar - pkgs.zip - pkgs.unzip - pkgs.gzip - pkgs.bzip2 - pkgs.wget - pkgs.par2cmdline - pkgs.cksfv - pkgs.bittorrent - pkgs.graphviz - pkgs.bash - pkgs.binutils - pkgs.gnum4 - pkgs.valgrind - pkgs.texinfo - pkgs.octavefront - pkgs.gnumake - pkgs.bisonnew - pkgs.flexnew - pkgs.gcc - pkgs.strategoxt - pkgs.ghc - pkgs.helium - pkgs.perl - pkgs.python - pkgs.libxml2 - pkgs.libxslt - pkgs.docbook_xml_dtd_42 - pkgs.docbook_xml_dtd_43 - pkgs.docbook_xml_ebnf_dtd - pkgs.docbook_xml_xslt - pkgs.subversion - pkgs.pan - pkgs.sylpheed - pkgs.firefox - pkgs.MPlayer - pkgs.MPlayerPlugin - pkgs.vlc - pkgs.zapping - pkgs.gqview - pkgs.hello - pkgs.xchm - pkgs.nxml - pkgs.uml - pkgs.nix - ]; + + i686LinuxPkgs = {inherit (import ./i686-linux.nix) + coreutils + findutils + diffutils + gnupatch + gnused + gnugrep + gawk + enscript + gnutar + zip + unzip + gzip + bzip2 + wget + par2cmdline + cksfv + bittorrent + graphviz + bash + binutils + gnum4 + valgrind + texinfo + octavefront + gnumake + bisonnew + flexnew + gcc + aterm + strategoxt + ghc + helium + perl + python + libxml2 + libxslt + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xml_ebnf_dtd + docbook_xml_xslt + subversion + pan + sylpheed + firefox + MPlayer + MPlayerPlugin + vlc + zapping + gqview + hello + xchm + nxml + uml + nix + ;}; + + + powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix) + aterm + hello + ;}; + + + body = [ + i686LinuxPkgs + powerpcDarwinPkgs + ]; }