Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9893

pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix

@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare 
 			doPropagate]);
+	inherit propagatedBuildInputs;
 	meta = {
 		description = "
 	Compiz BCOP.

pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix

@@ -3,7 +3,7 @@ build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamag
 */
 args: with args;
 [
-	libXcomposite libpng libSM libXrandr libXdamage libXinerama startupnotification 
+	libpng 
 	GConf mesa metacity librsvg dbus dbus_glib gnomedesktop git autoconf automake
 	libtool libxslt libwnck intltool perl perlXMLParser compiz
 ]

pkgs/applications/window-managers/compiz/0.6.2.nix

@@ -6,7 +6,7 @@ args : with args;
 		sha256 = "0k58bkbyqx94ch7scvn3d26296ai9nddfb6lg8v3bhbi2zj4i2n5";
 	};
 		buildInputs = [
-			    pkgconfig libXrender xextproto gtk libwnck GConf libgnome 
+			    pkgconfig gtk libwnck GConf libgnome 
 			    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml 
 			    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel 
 			    librsvg fuse 
@@ -14,7 +14,8 @@ args : with args;
 		  propagatedBuildInputs = [
 		    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
 		    libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
-		    dbus dbus_glib 
+		    dbus dbus_glib compositeproto fixesproto damageproto randrproto
+		    xineramaproto renderproto kbproto xextproto libXrender 
 		  ];
 		configureFlags = ["--enable-gtk" "--enable-fuse" 
 			"--enable-annotate" "--enable-librsvg"] ++ 
@@ -35,7 +36,9 @@ stdenv.mkDerivation
 rec {
 	name = "compiz-0.6.2";
 	builder = writeScript (name + "-builder")
-		(textClosure [doPatch doConfigure doMakeInstall doForceShare postAll]);
+		(textClosure [doPatch doConfigure doMakeInstall doPropagate 
+			doForceShare postAll]);
+	inherit propagatedBuildInputs;
 	meta = {
 		description = "
 	Compiz window manager