Merge pull request #20485 from anoever/master

vmware-guest: fix vmmouse driver
This commit is contained in:
Joachim F 2016-11-20 03:39:28 +01:00 committed by GitHub
commit eca9955b83

View File

@ -5,6 +5,7 @@ with lib;
let let
cfg = config.services.vmwareGuest; cfg = config.services.vmwareGuest;
open-vm-tools = pkgs.open-vm-tools; open-vm-tools = pkgs.open-vm-tools;
xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
in in
{ {
options = { options = {
@ -29,18 +30,17 @@ in
services.xserver = { services.xserver = {
videoDrivers = mkOverride 50 [ "vmware" ]; videoDrivers = mkOverride 50 [ "vmware" ];
modules = [ xf86inputvmmouse ];
config = '' config = ''
Section "InputDevice" Section "InputClass"
Identifier "VMMouse" Identifier "VMMouse"
MatchDevicePath "/dev/input/event*"
MatchProduct "ImPS/2 Generic Wheel Mouse"
Driver "vmmouse" Driver "vmmouse"
EndSection EndSection
''; '';
serverLayoutSection = ''
InputDevice "VMMouse"
'';
displayManager.sessionCommands = '' displayManager.sessionCommands = ''
${open-vm-tools}/bin/vmware-user-suid-wrapper ${open-vm-tools}/bin/vmware-user-suid-wrapper
''; '';