ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 21:57:02 +03:00
Code Issues Projects Releases Wiki Activity

nixos xserver: fix evdev driver with xserver 1.18

Browse Source 
... and add its man page.
Now I seem to be running fine with the new server.
This commit is contained in:
Vladimír Čunát 2016-05-23 13:01:01 +02:00
parent 69cc0a7bc5
commit 358533dc61
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/x11/xserver.nix
View File

@ -462,7 +462,14 @@ in
{ source = "${cfg.xkbDir}"; { source = "${cfg.xkbDir}";
target = "X11/xkb"; target = "X11/xkb";
} }
]); ])
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
[{
source = xorg.xf86inputevdev.out + "/share" + cfgPath;
target = cfgPath;
}]
);
environment.systemPackages = environment.systemPackages =
[ xorg.xorgserver.out [ xorg.xorgserver.out
@ -478,6 +485,7 @@ in
xorg.xauth xorg.xauth
pkgs.xterm pkgs.xterm
pkgs.xdg_utils pkgs.xdg_utils
xorg.xf86inputevdev.out # get evdev.4 man page
] ]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;