* Mac needs Unzip 5.52.

svn path=/nixpkgs/trunk/; revision=2434

maintainers/docs/todo.txt

@@ -10,3 +10,5 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* Consolidate unzip-5.52.

pkgs/system/all-packages-generic.nix

@@ -94,6 +94,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  unzip552 = (import ../tools/archivers/unzip-5.52) {
+    inherit fetchurl stdenv;
+  };
+
   gzip = (import ../tools/compression/gzip) {
     inherit fetchurl stdenv;
   };

pkgs/system/populate-cache.nix

@@ -92,13 +92,23 @@ let {
   ;};
 
   powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
+    unzip552
     aterm
     subversion
+    bisonnew
+    flexnew
+    libxml2
+    libxslt
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    docbook_xml_ebnf_dtd
+    docbook_xml_xslt
+    nxml
   ;};
 
 
   body = [
     i686LinuxPkgs
-#    powerpcDarwinPkgs
+    powerpcDarwinPkgs
   ];
 }

pkgs/system/stdenvs.nix

@@ -58,7 +58,7 @@
   # (essentially it's just the native environment).
   stdenvDarwin = (import ../stdenv/darwin) {
     stdenv = stdenvInitial;
-    genericStdenv = import ../stdenv/generic-branch;
+    genericStdenv = import ../stdenv/generic;
     inherit gccWrapper;
   };
 

pkgs/tools/archivers/unzip-5.52/builder.sh

@@ -0,0 +1,14 @@
+. $stdenv/setup
+
+builder() {
+    make -f unix/Makefile generic
+}
+
+installer() {
+    make -f unix/Makefile prefix=$out install
+}
+
+buildPhase=builder
+installPhase=installer
+
+genericBuild

pkgs/tools/archivers/unzip-5.52/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "unzip-5.52";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz;
+    md5 = "9d23919999d6eac9217d1f41472034a9";
+  };
+}