about summary refs log tree commit diff
path: root/pkgs/applications/window-managers/compiz/0.6.2.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2007-11-05 08:32:20 +0000
committerMichael Raskin <7c6f434c@mail.ru>2007-11-05 08:32:20 +0000
commit7b1c9a7a82343b693aacd5769e748b7c2f06bff7 (patch)
tree0072be34993d2ff2046d1f11dd8bde4810012208 /pkgs/applications/window-managers/compiz/0.6.2.nix
parent1bc214fd59019aefd60d6ea23c79fdc3293f2845 (diff)
Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also.
svn path=/nixpkgs/trunk/; revision=9577
Diffstat (limited to 'pkgs/applications/window-managers/compiz/0.6.2.nix')
-rw-r--r--pkgs/applications/window-managers/compiz/0.6.2.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix
index 3b6b26f20f1e6..669e84858b2de 100644
--- a/pkgs/applications/window-managers/compiz/0.6.2.nix
+++ b/pkgs/applications/window-managers/compiz/0.6.2.nix
@@ -9,14 +9,17 @@ args : with args;
 			    pkgconfig libXrender xextproto gtk libwnck GConf libgnome 
 			    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml 
 			    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel 
-			    librsvg fuse
+			    librsvg fuse 
 		];
 		  propagatedBuildInputs = [
 		    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
 		    libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
+		    dbus dbus_glib 
 		  ];
 		configureFlags = ["--enable-gtk" "--enable-fuse" 
-			"--enable-annotate" "--enable-librsvg"];
+			"--enable-annotate" "--enable-librsvg"] ++ 
+			(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
+		patches = [ ./glx-patch-0.6.2.patch ];
 	} null; /* null is a terminator for sumArgs */
 	with stringsWithDeps;
 let
@@ -24,14 +27,16 @@ let
     for i in $out/bin/*; do
      patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
     done
-  ") [minInit doMakeInstall];
+    ensureDir \$out/share/compiz-plugins/
+    ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/
+  ") [minInit doMakeInstall defEnsureDir];
 in
 
 stdenv.mkDerivation 
 rec {
 	name = "compiz-0.6.2";
 	builder = writeScript (name + "-builder")
-		(textClosure [doConfigure doMakeInstall doForceShare postAll]);
+		(textClosure [doPatch doConfigure doMakeInstall doForceShare postAll]);
 	meta = {
 		description = "
 	Compiz window manager