* Get rid of all those pointless little directories.

svn path=/nixpkgs/trunk/; revision=8107
This commit is contained in:
Eelco Dolstra 2007-02-28 16:38:39 +00:00
parent e7a1a1cba1
commit 3d98c0bf14
32 changed files with 27 additions and 27 deletions

View file

@ -22,86 +22,86 @@ rec {
gtk = gtkLibs.gtk;
esound = (import ./esound) {
esound = (import ./esound.nix) {
inherit fetchurl stdenv audiofile;
input = platform.esound;
};
libIDL = (import ./libIDL) {
libIDL = (import ./libIDL.nix) {
inherit fetchurl stdenv pkgconfig glib;
input = platform.libIDL;
lex = flex;
yacc = bison;
};
ORBit2 = (import ./ORBit2) {
ORBit2 = (import ./ORBit2.nix) {
inherit fetchurl stdenv pkgconfig glib libIDL popt;
input = platform.ORBit2;
};
GConf = (import ./GConf) {
GConf = (import ./GConf.nix) {
inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt;
input = platform.GConf;
};
gnomemimedata = (import ./gnome-mime-data) {
gnomemimedata = (import ./gnome-mime-data.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser;
input = platform.gnomemimedata;
};
gnomevfs = (import ./gnome-vfs) {
gnomevfs = (import ./gnome-vfs.nix) {
inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf
libbonobo gnomemimedata popt perlXMLParser gettext bzip2;
input = platform.gnomevfs;
};
gail = (import ./gail) {
gail = (import ./gail.nix) {
inherit fetchurl stdenv pkgconfig;
inherit gtk atk libgnomecanvas;
input = platform.gail;
};
libgnome = (import ./libgnome) {
libgnome = (import ./libgnome.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs
libbonobo GConf popt zlib esound;
input = platform.libgnome;
};
libart_lgpl = (import ./libart_lgpl) {
libart_lgpl = (import ./libart_lgpl.nix) {
inherit fetchurl stdenv;
input = platform.libart_lgpl;
};
libglade = (import ./libglade) {
libglade = (import ./libglade.nix) {
inherit fetchurl stdenv pkgconfig gtk libxml2;
input = platform.libglade;
};
libgnomecanvas = (import ./libgnomecanvas) {
libgnomecanvas = (import ./libgnomecanvas.nix) {
inherit fetchurl stdenv pkgconfig gtk libglade;
libart = libart_lgpl;
input = platform.libgnomecanvas;
};
libbonobo = (import ./libbonobo) {
libbonobo = (import ./libbonobo.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex;
yacc = bison;
input = platform.libbonobo;
};
libbonoboui = (import ./libbonoboui) {
libbonoboui = (import ./libbonoboui.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
libgnome libgnomecanvas gettext;
input = platform.libbonoboui;
};
libgnomeui = (import ./libgnomeui) {
libgnomeui = (import ./libgnomeui.nix) {
inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas
libbonoboui libglade libjpeg esound gnomekeyring;
input = platform.libgnomeui;
};
intltool = (import ./intltool) {
intltool = (import ./intltool.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser;
input = platform.intltool;
};
@ -113,7 +113,7 @@ rec {
inherit fetchurl;
};
libgnomeprint = (import ./libgnomeprint) {
libgnomeprint = (import ./libgnomeprint.nix) {
inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt
bison flex;
inherit glib pango;
@ -121,13 +121,13 @@ rec {
input = desktop.libgnomeprint;
};
libgnomeprintui = (import ./libgnomeprintui) {
libgnomeprintui = (import ./libgnomeprintui.nix) {
inherit fetchurl stdenv perl perlXMLParser pkgconfig;
inherit gtk libgnomeprint libgnomecanvas gnomeicontheme;
input = desktop.libgnomeprintui;
};
gtkhtml = (import ./gtkhtml) {
gtkhtml = (import ./gtkhtml.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext;
inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme;
input = desktop.gtkhtml;
@ -135,53 +135,53 @@ rec {
libgtkhtml = gtkhtml;
gnomeicontheme = (import ./gnome-icon-theme) {
gnomeicontheme = (import ./gnome-icon-theme.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser;
input = desktop.gnomeicontheme;
};
gnomekeyring = (import ./gnome-keyring) {
gnomekeyring = (import ./gnome-keyring.nix) {
inherit fetchurl stdenv pkgconfig glib gtk;
input = desktop.gnomekeyring;
};
gtksourceview = (import ./gtksourceview) {
gtksourceview = (import ./gtksourceview.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2
libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */
GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */;
input = desktop.gtksourceview;
};
scrollkeeper = (import ./scrollkeeper) {
scrollkeeper = (import ./scrollkeeper.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser
libxml2 libxslt docbook_xml_dtd_42;
input = desktop.scrollkeeper;
};
gnomedesktop = (import ./gnome-desktop) {
gnomedesktop = (import ./gnome-desktop.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk
libgnomeui scrollkeeper libjpeg;
input = desktop.gnomedesktop;
};
libwnck = (import ./libwnck) {
libwnck = (import ./libwnck.nix) {
inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext;
input = desktop.libwnck;
};
gnomepanel = (import ./gnome-panel) {
gnomepanel = (import ./gnome-panel.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2
libgnome libgnomeui gnomedesktop libglade libwnck
libjpeg libpng scrollkeeper libXmu;
input = desktop.gnomepanel;
};
libsoup = (import ./libsoup) {
libsoup = (import ./libsoup.nix) {
inherit stdenv fetchurl pkgconfig libxml2 glib;
input = desktop.libsoup;
};
startupnotification = (import ./startup-notification) {
startupnotification = (import ./startup-notification.nix) {
inherit stdenv fetchurl pkgconfig x11;
input = desktop.startupnotification;
};