svn merge ^/nixpkgs/trunk

- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
parent 3f44fb8f2f d789eb6a05
commit 5299c1f6fb
40 changed files with 277 additions and 269 deletions
@@ -11,6 +11,7 @@ stdenv.mkDerivation {

  configureFlags = "--disable-scrollkeeper";
  buildInputs = [ python libxml2Python libxslt ];
+  pythonPath = [ libxml2Python ];
  postInstall = "wrapPythonPrograms";

  buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ];