From 54df9b835f629b9b23302b18109b84434a8885d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 May 2005 13:00:13 +0000 Subject: [PATCH] * Add FreeBSD binaries to the cache. svn path=/nixpkgs/trunk/; revision=3020 --- pkgs/system/populate-cache.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 59cc77e9b8b..8329ce0ebeb 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -1,6 +1,8 @@ let { - i686LinuxPkgs = {inherit (import ./i686-linux.nix) + allPackages = import ./all-packages.nix; + + i686LinuxPkgs = {inherit (allPackages {system = "i686-linux";}) coreutils findutils diffutils @@ -47,7 +49,6 @@ let { libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 - docbook_xml_ebnf_dtd docbook_xml_xslt subversion pan @@ -92,7 +93,19 @@ let { apacheAntBlackdown14 ;}; - powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix) + i686FreeBSDPkgs = {inherit (allPackages {system = "i686-freebsd";}) + unzip + subversion + curl + libxml2 + libxslt + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xml_xslt + nxml + ;}; + + powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";}) unzip aterm subversion @@ -102,7 +115,6 @@ let { libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 - docbook_xml_ebnf_dtd docbook_xml_xslt nxml ;}; @@ -110,6 +122,7 @@ let { body = [ i686LinuxPkgs + i686FreeBSDPkgs powerpcDarwinPkgs ]; }