diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
| commit | 5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch) | |
| tree | 52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/development/tools/documentation | |
| parent | 3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff) | |
| parent | d789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff) | |
| download | nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.gz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.bz2 nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.lz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.xz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.zst nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.zip | |
svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/development/tools/documentation')
| -rw-r--r-- | pkgs/development/tools/documentation/gnome-doc-utils/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 545cd298f8c1..ad1be7265782 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; buildInputs = [ python libxml2Python libxslt ]; + pythonPath = [ libxml2Python ]; postInstall = "wrapPythonPrograms"; buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; |