summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2007-05-14 00:05:34 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2007-05-14 00:05:34 +0000
commit6b6a304af8396525abecdb0516ceef2c3b4a0394 (patch)
treeff945cabac7e51e41af40792403c93b2b599afa3 /pkgs/top-level/all-packages.nix
parentc068774f59cde80c90db73c2591eb6df8ada4b52 (diff)
downloadnixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar.gz
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar.bz2
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar.lz
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar.xz
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.tar.zst
nixpkgs-6b6a304af8396525abecdb0516ceef2c3b4a0394.zip
clean up for gimp and other packages
svn path=/nixpkgs/trunk/; revision=8678
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 4 insertions, 4 deletions
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 {