clean up for gimp and other packages

svn path=/nixpkgs/trunk/; revision=8678
This commit is contained in:
Armijn Hemel 2007-05-14 00:05:34 +00:00
parent c068774f59
commit 6b6a304af8
2 changed files with 6 additions and 6 deletions

View File

@ -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 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
, perlXMLParser, python, pygtk, gettext}: , perlXMLParser, python, pygtk, gettext}:
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1x4n9zddvw2krb2vs5rbar488b1vy7jq8jlb82nj92l6kz9sxk7x" ; 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 libart_lgpl libtiff libjpeg libpng libexif zlib perl
perlXMLParser python pygtk gettext ] ; perlXMLParser python pygtk gettext ] ;

View File

@ -2523,7 +2523,7 @@ rec {
abiword = import ../applications/office/abiword { abiword = import ../applications/office/abiword {
inherit fetchurl stdenv pkgconfig fribidi libpng popt; inherit fetchurl stdenv pkgconfig fribidi libpng popt;
inherit (gtkLibs) glib gtk pango; inherit (gtkLibs) gtk;
inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas; inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas;
}; };
@ -2640,9 +2640,9 @@ rec {
xftSupport = true; xftSupport = true;
}; };
ethereal = import ../applications/networking/sniffers/ethereal { wireshark = import ../applications/networking/sniffers/wireshark {
inherit fetchurl stdenv perl pkgconfig libpcap; inherit fetchurl stdenv perl pkgconfig libpcap;
inherit (gtkLibs) glib; inherit (gtkLibs) gtk;
}; };
feh = import ../applications/graphics/feh { feh = import ../applications/graphics/feh {
@ -2696,7 +2696,7 @@ rec {
gimp = import ../applications/graphics/gimp { gimp = import ../applications/graphics/gimp {
inherit fetchurl stdenv pkgconfig freetype fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext; 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 { git = import ../applications/version-management/git {