Author: chaoflow
Date: Sun Feb 26 17:23:54 2012
New Revision: 32597
URL: https://nixos.org/websvn/nix/?rev=32597&sc=1
Log:
adapted xpf to new libxml2Python
authored by: chaoflow, goibhniu
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 Sun Feb
26 17:23:50 2012 (r32596)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/text/xml/xpf/default.nix Sun Feb
26 17:23:54 2012 (r32597)
@@ -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 @@
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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Feb
26 17:23:50 2012 (r32596)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Feb
26 17:23:54 2012 (r32597)
@@ -1629,9 +1629,7 @@
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 { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
