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

* Synced with trunk @ 15346

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=15373
This commit is contained in:
Marc Weber 2009-04-28 13:51:58 +00:00
parent fb1e6d5c80
commit fa9ceac862
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upstart-jobs/xserver/default.nix
View File

@ -315,7 +315,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 =
@ -560,7 +560,7 @@ mkIf cfg.enable {
} }
${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 ""
} }

1
upstart-jobs/xserver/xserver.conf
View File

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