From 6b6a304af8396525abecdb0516ceef2c3b4a0394 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 14 May 2007 00:05:34 +0000
Subject: [PATCH] clean up for gimp and other packages

svn path=/nixpkgs/trunk/; revision=8678
---
 pkgs/applications/graphics/gimp/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 1f59fe763c3..d3ac21c9f71 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, glib, pango, atk, freetype
+{stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext}:
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1x4n9zddvw2krb2vs5rbar488b1vy7jq8jlb82nj92l6kz9sxk7x" ;
   };
   
-  buildInputs = [ pkgconfig gtk libgtkhtml glib pango atk freetype fontconfig
+  buildInputs = [ pkgconfig gtk libgtkhtml freetype fontconfig
                   libart_lgpl libtiff libjpeg libpng libexif zlib perl
                    perlXMLParser python pygtk gettext ] ;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d524bf8cf6a..a63878dd0b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2523,7 +2523,7 @@ rec {
 
   abiword = import ../applications/office/abiword {
     inherit fetchurl stdenv pkgconfig fribidi libpng popt;
-    inherit (gtkLibs) glib gtk pango;
+    inherit (gtkLibs) gtk;
     inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
@@ -2640,9 +2640,9 @@ rec {
     xftSupport = true;
   };
 
-  ethereal = import ../applications/networking/sniffers/ethereal {
+  wireshark = import ../applications/networking/sniffers/wireshark {
     inherit fetchurl stdenv perl pkgconfig libpcap;
-    inherit (gtkLibs) glib;
+    inherit (gtkLibs) gtk;
   };
 
   feh = import ../applications/graphics/feh {
@@ -2696,7 +2696,7 @@ rec {
   gimp = import ../applications/graphics/gimp {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext;
-    inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
+    inherit (gnome) gtk libgtkhtml libart_lgpl;
   };
 
   git = import ../applications/version-management/git {