Author: chaoflow
Date: Tue Feb 28 00:07:08 2012
New Revision: 32649
URL: https://nixos.org/websvn/nix/?rev=32649&sc=1
Log:
Revert "adapted xpf to new libxml2Python"
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/text/xml/xpf/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/text/xml/xpf/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/text/xml/xpf/default.nix Tue Feb
28 00:07:05 2012 (r32648)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/text/xml/xpf/default.nix Tue Feb
28 00:07:08 2012 (r32649)
@@ -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 @@
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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
28 00:07:05 2012 (r32648)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
28 00:07:08 2012 (r32649)
@@ -1629,7 +1629,9 @@
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 { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
