summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix1
-rw-r--r--pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix2
-rw-r--r--pkgs/applications/window-managers/compiz/0.6.2.nix9
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix
index ee6fd586dfe..1072e9b363c 100644
--- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix
+++ b/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.
diff --git a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix
index 1a041eaf2d6..717d66e2c29 100644
--- a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix
+++ b/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
 ]
diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix
index 92f67ba6877..6eef24beb99 100644
--- a/pkgs/applications/window-managers/compiz/0.6.2.nix
+++ b/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