diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index fa8e8078362..f17a47e6be3 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -1,6 +1,4 @@ -{stdenv, fetchurl, python, libxml2}: - -assert libxml2.pythonSupport == true; +{ stdenv, fetchurl, python, libxml2Python }: stdenv.mkDerivation { name = "xpf-0.2"; @@ -10,7 +8,11 @@ stdenv.mkDerivation { md5 = "d92658828139e1495e052d0cfe25d312"; }; - buildInputs = [python libxml2]; + buildInputs = [ python libxml2Python ]; + + preConfigure = '' + sed -i configure -e 's:test -e .*/libxml2.py":python -c "import 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 30318d527ca..092ce2bc636 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1629,9 +1629,7 @@ let xorriso = callPackage ../tools/cd-dvd/xorriso { }; - xpf = callPackage ../tools/text/xml/xpf { - libxml2 = libxml2Python; - }; + xpf = callPackage ../tools/text/xml/xpf { }; xsel = callPackage ../tools/misc/xsel { };