Merge pull request #1639 from iyzsong/gimp

gimp: wraped with PYTHONPATH, fix #223
This commit is contained in:
Domen Kožar 2014-01-31 00:12:03 -08:00
commit 15f74d0769
2 changed files with 7 additions and 1 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }: , python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gimp-2.8.10"; name = "gimp-2.8.10";
@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xlibs.libXpm python pygtk libart_lgpl libexif gettext xlibs.libXpm
wrapPython
]; ];
pythonPath = [ pygtk ];
postInstall = ''wrapPythonPrograms'';
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
#configureFlags = [ "--disable-print" ]; #configureFlags = [ "--disable-print" ];

View File

@ -7901,6 +7901,7 @@ let
inherit (gnome) libart_lgpl; inherit (gnome) libart_lgpl;
webkit = null; webkit = null;
lcms = lcms2; lcms = lcms2;
wrapPython = pythonPackages.wrapPython;
}; };
gimp = gimp_2_8; gimp = gimp_2_8;