* Added metacity, a better window manager than twm ;-)

svn path=/nixpkgs/trunk/; revision=8112

pkgs/desktops/gnome/default.nix

@@ -3,14 +3,14 @@
 { stdenv, fetchurl, pkgconfig, audiofile
 , flex, bison, popt, perl, zlib, libxml2, libxslt
 , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
-, libpng, gtkLibs, libXmu, bzip2
+, libpng, gtkLibs, libXmu, libXinerama, libXrandr, libXcursor, bzip2
 }:
 
 rec {
 
   # Platform
 
-  platform = (import ./src-gnome-platform-2.16.3.nix) {
+  platform = import ./src-gnome-platform-2.16.3.nix {
     inherit fetchurl;
   };
 
@@ -22,86 +22,86 @@ rec {
 
   gtk = gtkLibs.gtk;
 
-  esound = (import ./esound.nix) {
+  esound = import ./esound.nix {
     inherit fetchurl stdenv audiofile;
     input = platform.esound;
   };
 
-  libIDL = (import ./libIDL.nix) {
+  libIDL = import ./libIDL.nix {
     inherit fetchurl stdenv pkgconfig glib;
     input = platform.libIDL;
     lex = flex;
     yacc = bison;
   };
 
-  ORBit2 = (import ./ORBit2.nix) {
+  ORBit2 = import ./ORBit2.nix {
     inherit fetchurl stdenv pkgconfig glib libIDL popt;
     input = platform.ORBit2;
   };
 
-  GConf = (import ./GConf.nix) {
+  GConf = import ./GConf.nix {
     inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt;
     input = platform.GConf;
   };
 
-  gnomemimedata = (import ./gnome-mime-data.nix) {
+  gnomemimedata = import ./gnome-mime-data.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = platform.gnomemimedata;
   };
 
-  gnomevfs = (import ./gnome-vfs.nix) {
+  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.nix) {
+  gail = import ./gail.nix {
     inherit fetchurl stdenv pkgconfig;
     inherit gtk atk libgnomecanvas;
     input = platform.gail;
   };
 
-  libgnome = (import ./libgnome.nix) {
+  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.nix) {
+  libart_lgpl = import ./libart_lgpl.nix {
     inherit fetchurl stdenv;
     input = platform.libart_lgpl;
   };
 
-  libglade = (import ./libglade.nix) {
+  libglade = import ./libglade.nix {
     inherit fetchurl stdenv pkgconfig gtk libxml2;
     input = platform.libglade;
   };
 
-  libgnomecanvas = (import ./libgnomecanvas.nix) {
+  libgnomecanvas = import ./libgnomecanvas.nix {
     inherit fetchurl stdenv pkgconfig gtk libglade;
     libart = libart_lgpl;
     input = platform.libgnomecanvas;
   };
 
-  libbonobo = (import ./libbonobo.nix) {
+  libbonobo = import ./libbonobo.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex;
     yacc = bison;
     input = platform.libbonobo;
   };
 
-  libbonoboui = (import ./libbonoboui.nix) {
+  libbonoboui = import ./libbonoboui.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
             libgnome libgnomecanvas gettext;
     input = platform.libbonoboui;
   };
 
-  libgnomeui = (import ./libgnomeui.nix) {
+  libgnomeui = import ./libgnomeui.nix {
     inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas
             libbonoboui libglade libjpeg esound gnomekeyring;
     input = platform.libgnomeui;
   };
 
-  intltool = (import ./intltool.nix) {
+  intltool = import ./intltool.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = platform.intltool;
   };
@@ -109,11 +109,11 @@ rec {
 
   # Desktop
 
-  desktop = (import ./src-gnome-desktop-2.16.3.nix) {
+  desktop = import ./src-gnome-desktop-2.16.3.nix {
     inherit fetchurl;
   };
 
-  libgnomeprint = (import ./libgnomeprint.nix) {
+  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.nix) {
+  libgnomeprintui = import ./libgnomeprintui.nix {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig;
     inherit gtk libgnomeprint libgnomecanvas gnomeicontheme;
     input = desktop.libgnomeprintui;
   };
 
-  gtkhtml = (import ./gtkhtml.nix) {
+  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,55 +135,62 @@ rec {
 
   libgtkhtml = gtkhtml;
 
-  gnomeicontheme = (import ./gnome-icon-theme.nix) {
+  gnomeicontheme = import ./gnome-icon-theme.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser;
     input = desktop.gnomeicontheme;
   };
 
-  gnomekeyring = (import ./gnome-keyring.nix) {
+  gnomekeyring = import ./gnome-keyring.nix {
     inherit fetchurl stdenv pkgconfig glib gtk;
     input = desktop.gnomekeyring;
   };
 
-  gtksourceview = (import ./gtksourceview.nix) {
+  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.nix) {
+  scrollkeeper = import ./scrollkeeper.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
             libxml2 libxslt docbook_xml_dtd_42;
     input = desktop.scrollkeeper;
   };
 
-  gnomedesktop = (import ./gnome-desktop.nix) {
+  gnomedesktop = import ./gnome-desktop.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk
             libgnomeui scrollkeeper libjpeg;
     input = desktop.gnomedesktop;
   };
 
-  libwnck = (import ./libwnck.nix) {
+  libwnck = import ./libwnck.nix {
     inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext;
     input = desktop.libwnck;
   };
 
-  gnomepanel = (import ./gnome-panel.nix) {
+  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.nix) {
+  libsoup = import ./libsoup.nix {
     inherit stdenv fetchurl pkgconfig libxml2 glib;
     input = desktop.libsoup;
   };
   
-  startupnotification = (import ./startup-notification.nix) {
+  startupnotification = import ./startup-notification.nix {
     inherit stdenv fetchurl pkgconfig x11;
     input = desktop.startupnotification;
   };
 
+  metacity = import ./metacity.nix {
+    inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk
+      GConf startupnotification libXinerama libXrandr libXcursor
+      gettext;
+    input = desktop.metacity;
+  };
+  
 }

pkgs/desktops/gnome/metacity.nix

@@ -0,0 +1,13 @@
+{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
+, GConf, startupnotification, libXinerama, libXrandr, libXcursor
+, gettext
+}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  buildInputs = [
+    pkgconfig perl perlXMLParser glib gtk GConf startupnotification
+    libXinerama libXrandr libXcursor gettext
+  ];
+  #configureFlags = "--disable-gconf";
+}

pkgs/top-level/all-packages.nix

@@ -3012,7 +3012,7 @@ rec {
             perl perlXMLParser docbook_xml_dtd_42 gettext x11
             libtiff libjpeg libpng bzip2;
     gtkLibs = gtkLibs210; # !!! correct?
-    inherit (xlibs) libXmu;
+    inherit (xlibs) libXmu libXinerama libXrandr libXcursor;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {