public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making xserver cope with new evdev input device, and the proper dri mesa driver directory.

Browse Source 
svn path=/nixos/trunk/; revision=15346
This commit is contained in:
Lluís Batlle i Rossell 2009-04-28 07:58:20 +00:00
parent 1723eaec3d
commit bf04b4c7dc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upstart-jobs/xserver.conf
View File

@ -76,6 +76,7 @@ Section "ServerLayout"
@setCorePointer@ @setCorePointer@
Screen "Screen[0]" Screen "Screen[0]"
@serverLayoutOptions@ @serverLayoutOptions@
Option "AutoAddDevices" "0"
EndSection EndSection

4
upstart-jobs/xserver.nix
View File

@ -58,7 +58,7 @@ let
xorg.xf86inputevdev xorg.xf86inputevdev
] ]
++ getAttr ["modules"] [] videoDriverModules ++ getAttr ["modules"] [] videoDriverModules
++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]); ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
fontsForXServer = fontsForXServer =
@ -447,7 +447,7 @@ rec {
} }
${if videoDriver != "nvidia" ${if videoDriver != "nvidia"
then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri" then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
else "" else ""
} }