From 360ec296a64c8ec397a340d33873862854f69031 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 28 Feb 2012 00:07:08 +0000
Subject: [PATCH] Revert "adapted xpf to new libxml2Python"

This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
---
 pkgs/tools/text/xml/xpf/default.nix | 10 ++++------
 pkgs/top-level/all-packages.nix     |  4 +++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index f17a47e6be3..fa8e8078362 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, python, libxml2Python }:
+{stdenv, fetchurl, python, libxml2}:
+
+assert libxml2.pythonSupport == true;
 
 stdenv.mkDerivation {
   name = "xpf-0.2";
@@ -8,11 +10,7 @@ stdenv.mkDerivation {
     md5 = "d92658828139e1495e052d0cfe25d312";
   };
   
-  buildInputs = [ python libxml2Python ];
-
-  preConfigure = ''
-    sed -i configure -e 's:test -e .*/libxml2.py":python -c "import libxml2":'
-  '';
+  buildInputs = [python libxml2];
 
   meta = {
     description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76d89d5df88..68537248710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1629,7 +1629,9 @@ let
 
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
-  xpf = callPackage ../tools/text/xml/xpf { };
+  xpf = callPackage ../tools/text/xml/xpf {
+    libxml2 = libxml2Python;
+  };
 
   xsel = callPackage ../tools/misc/xsel { };