Add wmii package in the environment if wmii WM is enabled.

svn path=/nixos/branches/modular-nixos/; revision=14991

upstart-jobs/xserver/windowManager/wmii.nix

@@ -3,13 +3,9 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.wmii;
-in
 
-{
+  option = { services = { xserver = { windowManager = {
-  services = {
-    xserver = {
 
-      windowManager = {
     wmii = {
       enable = mkOption {
         default = false;
@@ -18,7 +14,17 @@ in
       };
     };
 
-        session = mkIf cfg.enable [{
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = option;
+
+  services = {
+    xserver = {
+
+      windowManager = {
+        session = [{
           name = "wmii";
           start = "
             ${pkgs.wmiiSnap}/bin/wmii &
@@ -29,4 +35,10 @@ in
 
     };
   };
+
+  environment = {
+    extraPackages = [
+      pkgs.wmiiSnap
+    ];
+  };
 }