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,22 +3,28 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.wmii;
+
+  option = { services = { xserver = { windowManager = {
+
+    wmii = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the wmii window manager.";
+      };
+    };
+
+  }; }; }; };
 in
 
-{
+mkIf cfg.enable {
+  require = option;
+
   services = {
     xserver = {
 
       windowManager = {
-        wmii = {
-          enable = mkOption {
-            default = false;
-            example = true;
-            description = "Enable the wmii window manager.";
-          };
-        };
-
-        session = mkIf cfg.enable [{
+        session = [{
           name = "wmii";
           start = "
             ${pkgs.wmiiSnap}/bin/wmii &
@@ -29,4 +35,10 @@ in
 
     };
   };
+
+  environment = {
+    extraPackages = [
+      pkgs.wmiiSnap
+    ];
+  };
 }