libgtkhtml = gtkhtml (packages were merged)

libgnomeprint and libnomeprintui were moved to desktop, from platform

svn path=/nixpkgs/trunk/; revision=6105
This commit is contained in:
Armijn Hemel 2006-08-12 00:01:37 +00:00
parent 259d0dd9ee
commit f0d6702f90

View File

@ -67,19 +67,6 @@ rec {
input = platform.libgnome;
};
libgnomeprint = (import ./libgnomeprint) {
inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt;
inherit glib pango;
libart = libart_lgpl;
input = platform.libgnomeprint;
};
libgnomeprintui = (import ./libgnomeprintui) {
inherit fetchurl stdenv perl perlXMLParser pkgconfig;
inherit gtk libgnomeprint libgnomecanvas gnomeicontheme;
input = platform.libgnomeprintui;
};
libart_lgpl = (import ./libart_lgpl) {
inherit fetchurl stdenv;
input = platform.libart_lgpl;
@ -126,16 +113,26 @@ rec {
inherit fetchurl;
};
libgnomeprint = (import ./libgnomeprint) {
inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt;
inherit glib pango;
libart = libart_lgpl;
input = desktop.libgnomeprint;
};
libgnomeprintui = (import ./libgnomeprintui) {
inherit fetchurl stdenv perl perlXMLParser pkgconfig;
inherit gtk libgnomeprint libgnomecanvas gnomeicontheme;
input = desktop.libgnomeprintui;
};
gtkhtml = (import ./gtkhtml) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext;
inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme;
input = desktop.gtkhtml;
};
libgtkhtml = (import ./libgtkhtml) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 gail;
input = desktop.libgtkhtml;
};
libgtkhtml = gtkhtml;
gnomeicontheme = (import ./gnome-icon-theme) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser;
@ -178,4 +175,9 @@ rec {
input = desktop.gnomepanel;
};
libsoup = (import ./libsoup) {
inherit stdenv fetchurl pkgconfig libxml2 glib;
input = desktop.libsoup;
};
}