* GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
This commit is contained in:
parent
9a4cd33d10
commit
7a233c1629
@ -1,18 +1,18 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
|
{ stdenv, fetchurl, pkgconfig, gtk, freetype
|
||||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
|
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
|
||||||
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
|
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "gimp-2.6.6";
|
name = "gimp-2.6.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.6.tar.bz2;
|
url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
|
||||||
sha256 = "0l875y4krqxxappnbw08s44bp3njjjriwyl8br5wmx25a3x63hjk";
|
sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig gtk libgtkhtml freetype fontconfig
|
pkgconfig gtk freetype fontconfig
|
||||||
libart_lgpl libtiff libjpeg libpng libexif zlib perl
|
libart_lgpl libtiff libjpeg libpng libexif zlib perl
|
||||||
perlXMLParser python pygtk gettext intltool babl gegl
|
perlXMLParser python pygtk gettext intltool babl gegl
|
||||||
];
|
];
|
||||||
|
@ -7020,8 +7020,9 @@ let
|
|||||||
inherit fetchurl stdenv pkgconfig freetype fontconfig
|
inherit fetchurl stdenv pkgconfig freetype fontconfig
|
||||||
libtiff libjpeg libpng libexif zlib perl perlXMLParser
|
libtiff libjpeg libpng libexif zlib perl perlXMLParser
|
||||||
python pygtk gettext xlibs intltool babl gegl;
|
python pygtk gettext xlibs intltool babl gegl;
|
||||||
inherit (gnome) gtk libgtkhtml libart_lgpl;
|
inherit (gnome) gtk libart_lgpl;
|
||||||
};
|
};
|
||||||
|
|
||||||
gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp; };
|
gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp; };
|
||||||
|
|
||||||
gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
|
gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user