Compiz-Fusion 0.7.8

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

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

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 		buildInputs = (import ../general-dependencies.nix args);
 		propagatedBuildInputs = [getopt libxslt];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 let 
 	fixPkgconfig = FullDepEntry ("

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

@@ -0,0 +1,34 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2;
+		sha256 ="1rs5r5b6rl39vlw68i8bwm5izs5dm666kygmg1c8dy2dab0xsnkq";
+	};
+		buildInputs = (import ../general-dependencies.nix args);
+		propagatedBuildInputs = [getopt libxslt];
+		configureFlags = [];
+	} ;
+	in with localDefs;
+let 
+	fixPkgconfig = FullDepEntry ("
+		ensureDir \$out/lib
+		ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
+	") [minInit doMakeInstall defEnsureDir];
+	fixInterpreter = FullDepEntry ("
+		sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
+	") [minInit doMakeInstall];
+in
+stdenv.mkDerivation rec {
+	name = "compiz-bcop-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare 
+			doPropagate]);
+	inherit propagatedBuildInputs;
+	meta = {
+		description = "
+	Compiz BCOP.
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2;
@@ -14,7 +14,7 @@ args : with args;
 			"PYTHONPATH" "\$PYTHONPATH"
 			"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
 		];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "compizconfig-settings-"+args.version;

pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix

@@ -0,0 +1,29 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2;
+		sha256 ="0djdzz1m9nvwzxfaywdm90bi816nig2ybfynf48394a5hpsng3l9";
+	};
+		buildInputs = (import ../general-dependencies.nix args) ++
+			[libcompizconfig bcop compizConfigPython python gettext pygtk 
+			pycairo configBackendGConf];
+		configureFlags = [];
+		wrappedEnv = [
+			"PYTHONPATH" "$(toPythonPath \$out)"
+			"PYTHONPATH" "\$PYTHONPATH"
+			"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
+		];
+	} ;
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "compizconfig-settings-"+args.version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [installPythonPackage (doWrap "\$out/bin/simple-ccsm")]);
+	meta = {
+		description = "
+	Compiz Settings Manager (simplified)
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2;
@@ -14,7 +14,7 @@ args : with args;
 			"PYTHONPATH" "\$PYTHONPATH"
 			"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
 		];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "compizconfig-settings-"+args.version;

pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix

@@ -0,0 +1,29 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2;
+		sha256 ="0s8difywj0ghc8c5xjxihfp8qhlhv5kyh00c2br1jh2ap5rrdfgc";
+	};
+		buildInputs = (import ../general-dependencies.nix args) ++
+			[libcompizconfig bcop compizConfigPython python gettext pygtk 
+			pycairo configBackendGConf];
+		configureFlags = [];
+		wrappedEnv = [
+			"PYTHONPATH" "$(toPythonPath \$out)"
+			"PYTHONPATH" "\$PYTHONPATH"
+			"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
+		];
+	} ;
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "compizconfig-settings-"+args.version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]);
+	meta = {
+		description = "
+	Compiz Settings Manager
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 		buildInputs = (import ../general-dependencies.nix args) ++
 			[libcompizconfig bcop python pyrex configBackendGConf];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "compizconfig-python-"+args.version;

pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix

@@ -0,0 +1,23 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2;
+		sha256 ="13g8vpgkimrbp19pd475ijiwbqx3zin0nzq8636l71yaqb0kjfjn";
+	};
+		buildInputs = (import ../general-dependencies.nix args) ++
+			[libcompizconfig bcop python pyrex configBackendGConf];
+		configureFlags = [];
+	} ;
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "compizconfig-python-"+args.version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
+	meta = {
+		description = "
+	Compiz configuration - Python part.
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2;
@@ -9,7 +9,7 @@ args : with args;
 			[bcop libcompizconfig];
 		configureFlags = [];
 		forceShare = ["man" "doc" "info" "lib/compizconfig"];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "compizconfig-backend-GConf-"+version;

pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix

@@ -0,0 +1,24 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2;
+		sha256 ="18bcfx3c2ipj3spfr8dg07h98pw77jh28w91w6n2fd5ffr6ja9q5";
+	};
+		buildInputs = (import ../general-dependencies.nix args) ++
+			[bcop libcompizconfig];
+		configureFlags = [];
+		forceShare = ["man" "doc" "info" "lib/compizconfig"];
+	} ;
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "compizconfig-backend-GConf-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	Compiz configuration backend (GConf).
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 		buildInputs = (import ../general-dependencies.nix args)++
 		[bcop libjpeg gettext pluginsMain];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 let
 	sharePlugins = FullDepEntry ("

pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix

@@ -0,0 +1,32 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2;
+		sha256 ="0hdnabq1bxln5cf6k9532iszj5qbhwkyl3b5d1gwfr80i01qxzy9";
+	};
+		buildInputs = (import ../general-dependencies.nix args)++
+		[bcop libjpeg gettext pluginsMain];
+		configureFlags = [];
+	} ;
+	in with localDefs;
+let
+	sharePlugins = FullDepEntry ("
+		ensureDir \$out/share/compiz-plugins
+		ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
+	") [minInit doMakeInstall defEnsureDir];
+	fixIncludes = FullDepEntry (''
+		export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz"
+	'') [minInit doUnpack];
+in
+stdenv.mkDerivation rec {
+	name = "compiz-fusion-plugins-extra-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
+	meta = {
+		description = "
+	Extra Compiz Fusion plugins.
+";
+		inherit src;
+	};
+}

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

@@ -5,5 +5,5 @@ args: with args;
 [
 	libpng 
 	GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake
-	libtool libxslt libwnck intltool perl perlXMLParser compiz
+	libtool libxslt libwnck intltool perl perlXMLParser compiz pkgconfig libxml2
 ]

pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 		buildInputs = (import ../general-dependencies.nix args)++
 			[bcop];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "libcompizconfig-"+version;

pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix

@@ -0,0 +1,23 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2;
+		sha256 ="1026icgzyjxnn68gbkd85n9p8pxlwbc3h0dqqvpqmr93q1nhdmjr";
+	};
+		buildInputs = (import ../general-dependencies.nix args)++
+			[bcop];
+		configureFlags = [];
+	} ;
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "libcompizconfig-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doIntltool doAutotools doConfigure doMakeInstall doForceShare]);
+	meta = {
+		description = "
+	Compiz configuration backend library.
+";
+		inherit src;
+	};
+}

pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix

@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.meta.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2;
@@ -8,7 +8,7 @@ args : with args;
 		buildInputs = (import ../general-dependencies.nix args)++
 		[bcop libjpeg gettext];
 		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
+	} ;
 	in with localDefs;
 let
 	sharePlugins = FullDepEntry ("

pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix

@@ -0,0 +1,29 @@
+args : with args;
+	let localDefs = builderDefs.meta.function {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2;
+		sha256 ="0lrvqi8kc8m6yap8pqbdg0wksckd3v3rp3k48q82pyvcwhaaf817";
+	};
+		buildInputs = (import ../general-dependencies.nix args)++
+		[bcop libjpeg gettext];
+		configureFlags = [];
+	} ;
+	in with localDefs;
+let
+	sharePlugins = FullDepEntry ("
+		ensureDir \$out/share/compiz-plugins
+		ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
+	") [minInit doMakeInstall defEnsureDir];
+in
+stdenv.mkDerivation rec {
+	name = "compiz-fusion-plugins-main-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]);
+	meta = {
+		description = "
+	Main Compiz Fusion plugins.
+";
+		inherit src;
+	};
+}

pkgs/top-level/all-packages.nix

@@ -6890,10 +6890,10 @@ let
   };
 
   compizFusion = assert mesaSupported; import ../applications/window-managers/compiz-fusion {
-    version = getConfig ["compizFusion" "version"] "0.7.4";
+    version = getConfig ["compizFusion" "version"] "0.7.8";
     inherit compiz;
     inherit stringsWithDeps lib builderDefs;
-    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt;
+    inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt libxml2;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
       libXinerama libICE libSM libXrender xextproto;
     inherit (gnome) startupnotification libwnck GConf;

pkgs/top-level/builder-defs.nix

@@ -228,6 +228,11 @@ args: with args; with stringsWithDeps; with lib;
                 ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags}
         ") ["minInit" "addInputs" "doUnpack"];
 
+	doIntltool = FullDepEntry ("
+		mkdir -p config
+		intltoolize --copy --force
+	") ["minInit" "addInputs" "doUnpack"];
+
         doAutotools = FullDepEntry ("
                 mkdir -p config
                 libtoolize --copy --force