Merging from trunk. I resolved some conflicts; I hope that well.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24429

1 files changed, 0 insertions, 15 deletions

diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix
deleted file mode 100644
index bfd0810facf0..000000000000
--- a/pkgs/applications/window-managers/compiz-fusion/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-args : with args;
-rec
-{
-        selectVersion = dir: import (dir + "/${args.version}.nix");
-	bcop = selectVersion ./bcop args;
-	libcompizconfig = selectVersion ./libcompizconfig (args // {inherit bcop;});
-	configBackendGConf = selectVersion ./config-backend (args // {inherit bcop libcompizconfig;});
-	compizConfigPython = selectVersion ./compizconfig-python (args // {inherit libcompizconfig 
-		bcop pyrex configBackendGConf;});
-	ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
-	pluginsMain = selectVersion ./main (args //{inherit bcop ;});
-	pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;});
-	compizManager = (import ./compiz-manager/0.6.0.nix) (args // {inherit bcop ccsm;});
-	ccsmSimple = selectVersion ./ccsm-simple (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
-}