about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-11-20 03:39:28 +0100
committerGitHub <noreply@github.com>2016-11-20 03:39:28 +0100
commiteca9955b8302efce3b12b0bc5aa117e38c8315bd (patch)
tree40cd3610a481ee3b8b19c86eaa7d43c6f804ca29 /nixos
parent8e6f36bd7b6ea78dcb26b1be54107ca37c038a81 (diff)
parent9a1507f2531b2a0afed51e8f171369a54f8e50bd (diff)
downloadnixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar.gz
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar.bz2
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar.lz
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar.xz
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.tar.zst
nixlib-eca9955b8302efce3b12b0bc5aa117e38c8315bd.zip
Merge pull request #20485 from anoever/master
vmware-guest: fix vmmouse driver
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/vmware-guest.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index b9a4f3b11dc1..ac5f87817fe9 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -5,6 +5,7 @@ with lib;
 let
   cfg = config.services.vmwareGuest;
   open-vm-tools = pkgs.open-vm-tools;
+  xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
 in
 {
   options = {
@@ -29,18 +30,17 @@ in
 
     services.xserver = {
       videoDrivers = mkOverride 50 [ "vmware" ];
+      modules = [ xf86inputvmmouse ];
 
       config = ''
-          Section "InputDevice"
+          Section "InputClass"
             Identifier "VMMouse"
+            MatchDevicePath "/dev/input/event*"
+            MatchProduct "ImPS/2 Generic Wheel Mouse"
             Driver "vmmouse"
           EndSection
         '';
 
-      serverLayoutSection = ''
-          InputDevice "VMMouse"
-        '';
-
       displayManager.sessionCommands = ''
           ${open-vm-tools}/bin/vmware-user-suid-wrapper
         '';