From 0c0f090bc97432d947a82673c3bdf1a520f09a4b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Nov 2009 09:34:12 +0000 Subject: [PATCH] Fix gnome-doc-utils svn path=/nixpkgs/trunk/; revision=18247 --- pkgs/desktops/gnome-2.28/default.nix | 3 ++- .../gnome-2.28/desktop/gnome-doc-utils/default.nix | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index c0e68fd9b54..dfc637551f8 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -200,7 +200,8 @@ rec { }; gnome_doc_utils = import ./desktop/gnome-doc-utils { - inherit (pkgs) stdenv fetchurl python pkgconfig libxslt; + inherit (pkgs) stdenv fetchurl python pkgconfig libxslt + makeWrapper; inherit intltool scrollkeeper; libxml2 = pkgs.libxml2Python; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix index e3ae09a0e32..c2e49deb009 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper}: +{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper, + makeWrapper}: stdenv.mkDerivation { name = "gnome-doc-utils-0.18.0"; @@ -7,5 +8,10 @@ stdenv.mkDerivation { sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380"; }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper ]; + buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper + makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \ + ''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH} \ + ''; }