JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "adapted xpf to new libxml2Python"

Browse Source 
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
This commit is contained in:
Florian Friesdorf 2012-02-28 00:07:08 +00:00
parent 0d8bea54e0
commit 360ec296a6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/text/xml/xpf/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, python, libxml2Python }: {stdenv, fetchurl, python, libxml2}:
assert libxml2.pythonSupport == true;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xpf-0.2"; name = "xpf-0.2";
@ -8,11 +10,7 @@ stdenv.mkDerivation {
md5 = "d92658828139e1495e052d0cfe25d312"; md5 = "d92658828139e1495e052d0cfe25d312";
}; };
buildInputs = [ python libxml2Python ]; buildInputs = [python libxml2];
preConfigure = ''
sed -i configure -e 's:test -e .*/libxml2.py":python -c "import libxml2":'
'';
meta = { meta = {
description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";

4
pkgs/top-level/all-packages.nix
View File

@ -1629,7 +1629,9 @@ let
xorriso = callPackage ../tools/cd-dvd/xorriso { }; 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 { }; xsel = callPackage ../tools/misc/xsel { };