From 0de9e19de7a79011de46fc7ab3eab3edafa77d5b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2003 19:41:37 +0000 Subject: [PATCH] * Added zlib. * Use zlib in libxml2. svn path=/nixpkgs/trunk/; revision=358 --- pkgs/libxml2/libxml2-build.sh | 3 +++ pkgs/libxml2/libxml2.fix | 1 + pkgs/zlib/zlib-build.sh | 10 ++++++++++ pkgs/zlib/zlib.fix | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100755 pkgs/zlib/zlib-build.sh create mode 100644 pkgs/zlib/zlib.fix diff --git a/pkgs/libxml2/libxml2-build.sh b/pkgs/libxml2/libxml2-build.sh index 8953ca5b80a..2d6d3b36d08 100755 --- a/pkgs/libxml2/libxml2-build.sh +++ b/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 diff --git a/pkgs/libxml2/libxml2.fix b/pkgs/libxml2/libxml2.fix index e6edf0596a6..8c2120cafa3 100644 --- a/pkgs/libxml2/libxml2.fix +++ b/pkgs/libxml2/libxml2.fix @@ -8,5 +8,6 @@ Package( ])) , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + , ("zlib", IncludeFix("zlib/zlib.fix")) ] ) diff --git a/pkgs/zlib/zlib-build.sh b/pkgs/zlib/zlib-build.sh new file mode 100755 index 00000000000..4ca1a830544 --- /dev/null +++ b/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 diff --git a/pkgs/zlib/zlib.fix b/pkgs/zlib/zlib.fix new file mode 100644 index 00000000000..d57ec454c12 --- /dev/null +++ b/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")) + ] +)