ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-21 20:58:41 +03:00
Code Issues Projects Releases Wiki Activity

* Allow metacity as the window manager.

Browse Source 
svn path=/nixos/trunk/; revision=8119
This commit is contained in:
Eelco Dolstra 2007-02-28 23:00:09 +00:00
parent f948c10999
commit 8960f038dd
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system/options.nix
View File

@ -481,6 +481,17 @@
}
{
name = ["services" "xserver" "windowManager"];
default = "metacity";
description = "
This option selects the window manager. Available values are
<literal>twm</literal> (extremely primitive),
<literal>metacity</literal>, and <literal>compiz</literal>.
";
}
{
name = ["services" "httpd" "enable"];
default = false;

1
system/upstart.nix
View File

@ -120,6 +120,7 @@ import ../upstart-jobs/gather.nix {
(import ../upstart-jobs/xserver.nix {
inherit config;
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
inherit (pkgs.gnome) metacity;
fontDirectories = import ./fonts.nix {inherit pkgs;};
})

8
upstart-jobs/xserver.nix
View File

@ -1,4 +1,4 @@
{ stdenv, writeText, lib, xorg, mesa, xterm, slim
{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity
, config
@ -24,6 +24,8 @@ let
resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
windowManager = getCfg "windowManager";
modules = [
xorg.xorgserver
@ -63,7 +65,11 @@ let
clientScript = writeText "xclient" "
${if windowManager == "twm" then "
${xorg.twm}/bin/twm &
" else if windowManager == "metacity" then "
${metacity}/bin/metacity &
" else abort ("unknown window manager "+ windowManager)}
${xterm}/bin/xterm -ls
";