* Get rid of the `(import (__toPath ((toString

./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.


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

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

pkgs/applications/window-managers/compiz-fusion/default.nix

@@ -1,13 +1,14 @@
 args : with args;
 rec
 {
-	bcop = import ./bcop args;
-	libcompizconfig = import ./libcompizconfig (args // {inherit bcop;});
-	configBackendGConf = import ./config-backend (args // {inherit bcop libcompizconfig;});
-	compizConfigPython = import ./compizconfig-python (args // {inherit libcompizconfig 
+        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 = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
-	pluginsMain = import ./main (args //{inherit bcop ;});
-	pluginsExtra = import ./extra (args //{inherit bcop pluginsMain;});
-	compizManager = import ./compiz-manager (args // {inherit bcop ccsm;});
+	ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
+	pluginsMain = selectVersion ./main (args //{inherit bcop ;});
+	pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;});
+	compizManager = selectVersion ./compiz-manager (args // {inherit bcop ccsm;});
 }

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

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

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args

pkgs/applications/window-managers/fbpanel/default.nix

@@ -1,2 +0,0 @@
-args : 
-(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args