From d1003bca3baea9bfe1d46efa686d7e17a32112e3 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Thu, 19 Aug 2004 15:28:48 +0000
Subject: [PATCH] Added arguments to the libxml2 Nix expression to control the
 creation of Python bindings. De default libxml2 in all-packages-generic now
 creates Python bindings for libxml2.

svn path=/nixpkgs/trunk/; revision=1297
---
 pkgs/development/libraries/libxml2/default.nix | 10 +++++++++-
 pkgs/system/all-packages-generic.nix           |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index b72673df164..47068f071ad 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,12 +1,20 @@
-{stdenv, fetchurl, zlib}:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
 
 assert zlib != null;
+assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
   name = "libxml2-2.6.8";
+  builder = ./builder.sh;
+
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.8.tar.bz2;
     md5 = "f8a0dc1983f67db388baa0f7c65d2b70";
   };
+
+  python = if pythonSupport then python else null;
+  inherit pythonSupport;
+
+  buildInputs =  if pythonSupport then [python] else [];
   propagatedBuildInputs = [zlib];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index fb6b1120fd3..6dda81bf028 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -422,7 +422,7 @@ rec {
   };
 
   libxml2 = (import ../development/libraries/libxml2) {
-    inherit fetchurl stdenv zlib;
+    inherit fetchurl stdenv zlib python;
   };
 
   libxslt = (import ../development/libraries/libxslt) {