diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 13:01:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 13:02:55 +0200 |
| commit | 358533dc61ab40308c02990746314d095f437e1b (patch) | |
| tree | 3dae6262a33200028d713ba3127b54098bbd8d1c /nixos/modules/services/x11/xserver.nix | |
| parent | 69cc0a7bc5832a98f29e82a1674ed473986b6f4f (diff) | |
| download | nixlib-358533dc61ab40308c02990746314d095f437e1b.tar nixlib-358533dc61ab40308c02990746314d095f437e1b.tar.gz nixlib-358533dc61ab40308c02990746314d095f437e1b.tar.bz2 nixlib-358533dc61ab40308c02990746314d095f437e1b.tar.lz nixlib-358533dc61ab40308c02990746314d095f437e1b.tar.xz nixlib-358533dc61ab40308c02990746314d095f437e1b.tar.zst nixlib-358533dc61ab40308c02990746314d095f437e1b.zip | |
nixos xserver: fix evdev driver with xserver 1.18
... and add its man page. Now I seem to be running fine with the new server.
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 356ee7d265aa..41d34b4bbe55 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -462,7 +462,14 @@ in { source = "${cfg.xkbDir}"; 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 = [ xorg.xorgserver.out @@ -478,6 +485,7 @@ in xorg.xauth pkgs.xterm pkgs.xdg_utils + xorg.xf86inputevdev.out # get evdev.4 man page ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; |