* Enable DRI support in the X server.
svn path=/nixos/trunk/; revision=8067
This commit is contained in:
parent
fdb5a06fa4
commit
a50097b9ca
|
@ -471,6 +471,16 @@
|
|||
}
|
||||
|
||||
|
||||
{
|
||||
name = ["services" "xserver" "driSupport"];
|
||||
default = false;
|
||||
description = "
|
||||
Whether to enable accelerated OpenGL rendering through the
|
||||
Direct Rendering Interface (DRI).
|
||||
";
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
name = ["services" "httpd" "enable"];
|
||||
default = false;
|
||||
|
|
|
@ -119,7 +119,7 @@ import ../upstart-jobs/gather.nix {
|
|||
++ optional ["services" "xserver" "enable"]
|
||||
(import ../upstart-jobs/xserver.nix {
|
||||
inherit config;
|
||||
inherit (pkgs) stdenv writeText lib xterm slim xorg;
|
||||
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
|
||||
fontDirectories = import ./fonts.nix {inherit pkgs;};
|
||||
})
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, writeText, lib, xorg, xterm, slim
|
||||
{ stdenv, writeText, lib, xorg, mesa, xterm, slim
|
||||
|
||||
, config
|
||||
|
||||
|
@ -102,6 +102,10 @@ end script
|
|||
env SLIM_CFGFILE=${slimConfig}
|
||||
env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
|
||||
|
||||
${if getCfg "driSupport"
|
||||
then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
|
||||
else ""}
|
||||
|
||||
exec ${slim}/bin/slim
|
||||
";
|
||||
|
||||
|
|
Loading…
Reference in New Issue