Added xfs; fixed nixos-checkout
svn path=/nixos/trunk/; revision=9579
This commit is contained in:
parent
b494c20cb5
commit
8c9d312e21
@ -29,7 +29,7 @@ fi
|
|||||||
svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
|
svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
|
||||||
svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
|
svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
|
||||||
svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
|
svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
|
||||||
ln -sf services nixos/services
|
ln -sfn ../services nixos/services
|
||||||
|
|
||||||
# A few symlink.
|
# A few symlink.
|
||||||
ln -sfn ../nixpkgs/pkgs nixos/pkgs
|
ln -sfn ../nixpkgs/pkgs nixos/pkgs
|
||||||
|
@ -1415,4 +1415,13 @@ root ALL=(ALL) SETENV: ALL
|
|||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
name = ["services" "xfs" "enable"];
|
||||||
|
default = false;
|
||||||
|
description = "
|
||||||
|
Whether to enable X Font Server.
|
||||||
|
";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
]
|
]
|
||||||
|
@ -194,6 +194,12 @@ import ../upstart-jobs/gather.nix {
|
|||||||
inherit config pkgs;
|
inherit config pkgs;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# X Font Server
|
||||||
|
++ optional ["services" "xfs" "enable"]
|
||||||
|
(import ../upstart-jobs/xfs.nix {
|
||||||
|
inherit config pkgs;
|
||||||
|
})
|
||||||
|
|
||||||
++ optional ["services" "ircdHybrid" "enable"]
|
++ optional ["services" "ircdHybrid" "enable"]
|
||||||
(import ../upstart-jobs/ircd-hybrid.nix {
|
(import ../upstart-jobs/ircd-hybrid.nix {
|
||||||
inherit config pkgs;
|
inherit config pkgs;
|
||||||
|
15
upstart-jobs/xfs.conf
Normal file
15
upstart-jobs/xfs.conf
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
# font server configuration file
|
||||||
|
# $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
|
||||||
|
|
||||||
|
clone-self = on
|
||||||
|
use-syslog = off
|
||||||
|
error-file = /var/log/xfs.log
|
||||||
|
# in decipoints
|
||||||
|
default-point-size = 120
|
||||||
|
default-resolutions = 75,75,100,100
|
||||||
|
|
||||||
|
# font cache control, specified in KB
|
||||||
|
cache-hi-mark = 2048
|
||||||
|
cache-low-mark = 1433
|
||||||
|
cache-balance = 70
|
||||||
|
catalogue = /var/run/current-system/sw/share/X11-fonts/
|
20
upstart-jobs/xfs.nix
Normal file
20
upstart-jobs/xfs.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
pkgs, config
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
configFile = ./xfs.conf;
|
||||||
|
startingDependency = if (config.get [ "services" "gw6c" "enable" ])
|
||||||
|
then "gw6c" else "network-interfaces";
|
||||||
|
in
|
||||||
|
rec {
|
||||||
|
name = "xfs";
|
||||||
|
groups = [];
|
||||||
|
users = [];
|
||||||
|
job = "
|
||||||
|
description = \"X Font Server\"
|
||||||
|
start on ${startingDependency}/started
|
||||||
|
stop on ${startingDependency}/stop
|
||||||
|
|
||||||
|
respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
|
||||||
|
";
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user