Fixed log nesting; added Qi.

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

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

@@ -9,7 +9,6 @@ args : with args;
 		propagatedBuildInputs = [getopt libxslt];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 let 
 	fixPkgconfig = FullDepEntry ("
 		ensureDir \$out/lib

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

@@ -15,7 +15,6 @@ args : with args;
 			"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
 		];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 stdenv.mkDerivation rec {
 	name = "compizconfig-settings-"+args.version;
 	builder = writeScript (name + "-builder")

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

@@ -20,7 +20,6 @@ args : with args;
 			"XORG_DRIVER_PATH" "/nix/store/.*"
 		]];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 let
 	install = FullDepEntry ("
 		sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager

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

@@ -9,7 +9,6 @@ args : with args;
 			[libcompizconfig bcop python pyrex configBackendGConf];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 stdenv.mkDerivation rec {
 	name = "compizconfig-python-"+args.version;
 	builder = writeScript (name + "-builder")

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

@@ -10,7 +10,6 @@ args : with args;
 		configureFlags = [];
 		forceShare = ["man" "doc" "info" "lib/compizconfig"];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 stdenv.mkDerivation rec {
 	name = "compizconfig-backend-GConf-"+version;
 	builder = writeScript (name + "-builder")

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

@@ -9,7 +9,6 @@ args : with args;
 		[bcop libjpeg gettext pluginsMain];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 let
 	sharePlugins = FullDepEntry ("
 		ensureDir \$out/share/compiz-plugins

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

@@ -9,7 +9,6 @@ args : with args;
 			[bcop];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 stdenv.mkDerivation rec {
 	name = "libcompizconfig-"+version;
 	builder = writeScript (name + "-builder")

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

@@ -9,7 +9,6 @@ args : with args;
 		[bcop libjpeg gettext];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 let
 	sharePlugins = FullDepEntry ("
 		ensureDir \$out/share/compiz-plugins

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

@@ -21,7 +21,6 @@ args : with args;
 			(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
 		patches = [ ./glx-patch-0.6.2.patch ];
 	} null; /* null is a terminator for sumArgs */
-	with stringsWithDeps;
 let
 	postAll = FullDepEntry ("
     for i in $out/bin/*; do