adding python package lxml to make scripts in inkscape work

svn path=/nixpkgs/trunk/; revision=17858

3 files changed, 20 insertions, 2 deletions

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index cf708da62a96..c0f9b1680044 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
-    python pyxml
+    python pyxml lxml
   ];
 
   buildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     for i in "$out/bin/"*
     do
       wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml})" ||  \
+       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" ||  \
         exit 2
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 115fd388d257..7e4f481b88f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7162,6 +7162,7 @@ let
       popt libxml2 libxslt libpng boehmgc fontconfig
       libsigcxx lcms boost gettext cairomm
       python pyxml makeWrapper;
+    inherit (pythonPackages) lxml;
     inherit (gtkLibs) gtk glib glibmm gtkmm;
     inherit (xlibs) libXft;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 583d41d4bcdf..4ee6fec488dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,6 +106,23 @@ rec {
     };
   };
 
+  lxml = buildPythonPackage ( rec {
+    name = "lxml-2.2.2";
+
+    src = fetchurl {
+      url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz;
+      sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv";
+    };
+
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+
+    meta = { 
+      description = "Pythonic binding for the libxml2 and libxslt libraries";
+      homepage = http://codespeak.net/lxml/index.html;
+      license = "BSD";
+    };
+  });
+
   nevow = buildPythonPackage (rec {
     name = "nevow-0.9.33";