From 7a233c16294b8f2a0c0469e2402f72f1f74822b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Nov 2009 21:28:11 +0000
Subject: [PATCH] * GIMP updated to 2.6.7.  It no longer needs libgtkhtml.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
---
 pkgs/applications/graphics/gimp/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix             |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 31e8ce58de0..4d1985d4911 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
+{ stdenv, fetchurl, pkgconfig, gtk, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
 }:
 
-stdenv.mkDerivation {
-  name = "gimp-2.6.6";
+stdenv.mkDerivation rec {
+  name = "gimp-2.6.7";
   
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.6.tar.bz2;
-    sha256 = "0l875y4krqxxappnbw08s44bp3njjjriwyl8br5wmx25a3x63hjk";
+    url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
+    sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4";
   };
   
   buildInputs = [
-    pkgconfig gtk libgtkhtml freetype fontconfig
+    pkgconfig gtk freetype fontconfig
     libart_lgpl libtiff libjpeg libpng libexif zlib perl
     perlXMLParser python pygtk gettext intltool babl gegl
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 210661e71ad..f4e600d0005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7020,8 +7020,9 @@ let
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser
       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; };
 
   gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {