Revert "separate libxml2 python bindings, added libconvOrLibC dependency"

This reverts commit 614b18668433329cc5686c34b51a63e51c86c9f4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32650

1 files changed, 9 insertions, 3 deletions

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 1907a470b68d..fe3b6bd6487e 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libiconvOrLibc, zlib }:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
+
+assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
   name = "libxml2-2.7.7";
@@ -8,11 +10,15 @@ stdenv.mkDerivation {
     sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
   };
 
-  propagatedBuildInputs = [ libiconvOrLibc zlib ];
+  configureFlags = ''                                                  
+    ${if pythonSupport then "--with-python=${python}" else ""}         
+  '';
+  
+  propagatedBuildInputs = [zlib];
 
   setupHook = ./setup-hook.sh;
 
-  passthru = { libiconv = libiconvOrLibc; };
+  passthru = {inherit pythonSupport;};
 
   meta = {
     homepage = http://xmlsoft.org/;