public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add error messages to detect if the default (not override by the user) WM/DM is enable. 

Enable xterm desktop manager.

svn path=/nixos/branches/modular-nixos/; revision=14990
This commit is contained in:
Nicolas Pierron 2009-04-11 22:28:33 +00:00
parent a67aecb38b
commit 33a0873f6f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upstart-jobs/xserver/desktopManager/default.nix
View File

@ -57,12 +57,12 @@ in
description = "
Default desktop manager loaded if none have been chosen.
";
merge = list:
let defaultDM = mergeOneOption list; in
merge = mergeOneOption;
apply = defaultDM:
if any (w: w.name == defaultDM) cfg.session.list then
defaultDM
else
throw "Default desktop manager not found.";
throw "Default desktop manager ($(defaultDM)) not found.";
};
};
};

4
upstart-jobs/xserver/desktopManager/xterm.nix
View File

@ -8,8 +8,8 @@ let
xterm = {
enable = mkOption {
default = false;
example = true;
default = true;
example = false;
description = "Enable a xterm terminal as a desktop manager.";
};
};

6
upstart-jobs/xserver/windowManager/default.nix
View File

@ -45,12 +45,12 @@ in
description = "
Default window manager loaded if none have been chosen.
";
merge = list:
let defaultWM = mergeOneOption list; in
merge = mergeOneOption;
apply = defaultWM:
if any (w: w.name == defaultWM) cfg.session then
defaultWM
else
throw "Default window manager not found.";
throw "Default window manager (${defaultWM}) not found.";
};
};
};