alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #11930 from exi/xdgDir-configurable

Browse source 
xserver: make xkbdir configurable
This commit is contained in:
Arseniy Seroka 2015-12-25 17:25:28 +03:00
parent 6878b2b21d 92e48a4383
commit 4f2f99d9b6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/x11/xserver.nix
View file

@ -280,6 +280,14 @@ in
'';
};
xkbDir = mkOption {
type = types.str;
default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
description = ''
Path used for -xkbdir xserver parameter.
'';
};
config = mkOption {
type = types.lines;
description = ''
@ -462,7 +470,7 @@ in
target = "X11/xorg.conf";
}
# -xkbdir command line option does not seems to be passed to xkbcomp.
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
{ source = "${cfg.xkbDir}";
target = "X11/xkb";
}
]);
@ -528,7 +536,7 @@ in
[ "-ac"
"-terminate"
"-config ${configFile}"
"-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
"-xkbdir" "${cfg.xkbDir}"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]