* Added zlib.

* Use zlib in libxml2.

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

pkgs/libxml2/libxml2-build.sh

@@ -1,5 +1,6 @@
 #! /bin/sh
 
+envpkgs="$zlib"
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
@@ -8,3 +9,5 @@ cd libxml2-* || exit 1
 make || exit 1
 make install || exit 1
 strip -S $out/lib/*.a || exit 1
+
+echo $envpkgs > $out/envpkgs || exit 1

pkgs/libxml2/libxml2.fix

@@ -8,5 +8,6 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
   ]
 )

pkgs/zlib/zlib-build.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd zlib-* || exit 1
+./configure --prefix=$out --shared || exit 1
+make || exit 1
+mkdir $out || exit 1
+make install || exit 1

pkgs/zlib/zlib.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "zlib-1.1.4")
+
+  , ("build", Relative("zlib/zlib-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.gzip.org/zlib/zlib-1.1.4.tar.gz")
+      , ("md5", "abc405d0bdd3ee22782d7aa20e440f08")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)