From 205aa93e924c623ae38a4a4a3cb86015f6c90d28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Feb 2009 16:14:23 +0000
Subject: [PATCH] * libxml2 updated to 2.7.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13972
---
 pkgs/development/libraries/libxml2/builder.sh | 16 ----------
 .../development/libraries/libxml2/default.nix | 30 +++++++++++++------
 .../development/libraries/libxslt/default.nix | 15 ++++++++--
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100755 pkgs/development/libraries/libxml2/builder.sh

diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh
deleted file mode 100755
index 24ad62eeb81..00000000000
--- a/pkgs/development/libraries/libxml2/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-zlib=$zlib"
-if test "$pythonSupport"; then
-    configureFlags="--with-python=$python $configureFlags"
-fi
-
-patchPhase() {
-    echo "Patching"
-    mv configure configure.old
-    sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" < configure.old > configure
-    chmod u+x configure
-}
-patchPhase=patchPhase
-
-genericBuild
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index a1043bad67c..2797bddcb39 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,22 +1,34 @@
 {stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
 
-assert zlib != null;
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.6.32";
-  builder = ./builder.sh;
+  name = "libxml2-2.7.3";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz;
-    sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v";
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz;
+    sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
   };
 
-  python = if pythonSupport then python else null;
-  inherit pythonSupport zlib;
+  configureFlags = ''
+    ${if pythonSupport then "--with-python=${python}" else ""}
+  '';
+
+  patchPhase = ''
+    sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" -i configure
+  '';
+
+  passthru = {inherit pythonSupport;};
 
-  buildInputs =  if pythonSupport then [python] else [];
   propagatedBuildInputs = [zlib];
 
-  postInstall = "ensureDir $out/nix-support; cp ${./setup-hook.sh} $out/nix-support/setup-hook";
+  postInstall = ''
+    ensureDir $out/nix-support
+    cp ${./setup-hook.sh} $out/nix-support/setup-hook
+  '';
+
+  meta = {
+    homepage = http://xmlsoft.org/;
+    description = "A XML parsing library for C";
+  };
 }
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 7426ef1de24..5f8ec9dde1b 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,13 +1,22 @@
 {stdenv, fetchurl, libxml2}:
 
-assert libxml2 != null;
-
 stdenv.mkDerivation {
   name = "libxslt-1.1.24";
+  
   src = fetchurl {
     url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
     sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e";
   };
+  
   buildInputs = [libxml2];
-  postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/";
+  
+  postInstall = ''
+    ensureDir $out/nix-support
+    ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/
+  '';
+
+  meta = {
+    homepage = http://xmlsoft.org/XSLT/;
+    description = "A C library and tools to do XSL transformations";
+  };
 }