From dbae3ea4a28c44df0effb65588d151b061259899 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Sep 2008 15:20:53 +0000
Subject: [PATCH] * Compiz 0.7.8.

svn path=/nixpkgs/trunk/; revision=12881
---
 .../window-managers/compiz/{0.7.4.nix => 0.7.8.nix}       | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/applications/window-managers/compiz/{0.7.4.nix => 0.7.8.nix} (88%)

diff --git a/pkgs/applications/window-managers/compiz/0.7.4.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix
similarity index 88%
rename from pkgs/applications/window-managers/compiz/0.7.4.nix
rename to pkgs/applications/window-managers/compiz/0.7.8.nix
index 6ae8f9dec0d..a7e700af4ea 100644
--- a/pkgs/applications/window-managers/compiz/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz/0.7.8.nix
@@ -2,14 +2,14 @@ args : with args;
 	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
-		url = http://releases.compiz-fusion.org/0.7.4/compiz/compiz-0.7.4.tar.bz2;
-		sha256 = "1ik2wlrc469l0l9j7yhfapcmwkshhva5b5sh5h4czg3bj5iivaf7";
+		url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz;
+		sha256 = "00v5br8vi9ycrzvgdsmdbv31kv1n9g88hxm0ax9yhy6cfsvm4vxl";
 	};
 		buildInputs = [
 			    pkgconfig gtk libwnck GConf libgnome 
 			    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml 
 			    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel 
-			    librsvg fuse 
+			    librsvg fuse gettext
 		];
 		  propagatedBuildInputs = [
 		    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
@@ -36,7 +36,7 @@ in
 
 stdenv.mkDerivation 
 rec {
-	name = "compiz-"+version;
+	name = "compiz-0.7.8";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate 
 			doForceShare postAll]);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cc4bb2019d..9b94a6c47d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5935,9 +5935,9 @@ let
     version = "0.6.2";
   };
 
-  compizBase = composedArgsAndFun (assert mesaSupported; selectVersion ../applications/window-managers/compiz "0.7.4") {
+  compizBase = composedArgsAndFun (assert mesaSupported; selectVersion ../applications/window-managers/compiz "0.7.8") {
     inherit lib builderDefs stringsWithDeps;
-    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
+    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
       libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
       damageproto randrproto xineramaproto renderproto kbproto xproto libX11