summary refs log tree commit diff
path: root/pkgs/tools/text/xml
diff options
context:
space:
mode:
authorFlorian Friesdorf <flo@chaoflow.net>2012-02-28 00:07:08 +0000
committerFlorian Friesdorf <flo@chaoflow.net>2012-02-28 00:07:08 +0000
commit360ec296a64c8ec397a340d33873862854f69031 (patch)
treeae071a238118611055d5967b93ac8811d70fd8cc /pkgs/tools/text/xml
parent0d8bea54e069c916858f1f57403819e2dacc0b09 (diff)
downloadnixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar.gz
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar.bz2
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar.lz
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar.xz
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.tar.zst
nixpkgs-360ec296a64c8ec397a340d33873862854f69031.zip
Revert "adapted xpf to new libxml2Python"
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
Diffstat (limited to 'pkgs/tools/text/xml')
-rw-r--r--pkgs/tools/text/xml/xpf/default.nix10
1 files changed, 4 insertions, 6 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";