movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-24 18:16:21 +03:00
Code Activity

Generate hal configuration file form the xserver settings.

Browse source 
svn path=/nixos/branches/modular-nixos/; revision=16046
This commit is contained in:
Nicolas Pierron 2009-06-25 23:29:49 +00:00
parent 0bd210bb78
commit f61a3ebd2c
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/services/x11/xserver/default.nix
View file

@ -338,6 +338,30 @@ let
]; ];
halConfigFiles = [
(pkgs.writeTextFile {
name = "hal-policy-keymap";
destination = "/policy/30-keymap.fdi";
text = ''
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.keymap">
<append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
</match>
<match key="info.capabilities" contains="input.keys">
<merge key="input.x11_options.XkbRules" type="string">base</merge>
<merge key="input.x11_options.XkbModel" type="string">${cfg.xkbModel}</merge>
<merge key="input.x11_options.XkbLayout" type="string">${cfg.layout}</merge>
<append key="input.x11_options.XkbOptions" type="strlist">${cfg.xkbOptions}</append>
</match>
</device>
</deviceinfo>
'';
})
];
configFile = stdenv.mkDerivation { configFile = stdenv.mkDerivation {
name = "xserver.conf"; name = "xserver.conf";
src = ./xserver.conf; src = ./xserver.conf;
@ -543,6 +567,10 @@ mkIf cfg.enable {
}; };
}; };
hal = {
extraFdi = halConfigFiles;
};
extraJobs = [{ extraJobs = [{
name = "xserver"; name = "xserver";
job = '' job = ''