diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2016-07-30 10:40:30 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2016-07-30 13:37:51 +0200 |
| commit | 5c9309c231937bf069725720e3659c48d3b5d03c (patch) | |
| tree | fe16228d6ebfeaf48dd598d61672438013625b5b /nixos/modules/services/x11 | |
| parent | 40b838b94d906793d160fa17f817157fc684cdbe (diff) | |
| download | nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar.gz nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar.bz2 nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar.lz nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar.xz nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.tar.zst nixlib-5c9309c231937bf069725720e3659c48d3b5d03c.zip | |
xorg.xorgserver: enable glamor support
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 35816c3a16dd..02fa5851d10e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -14,8 +14,8 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; - ati = { modules = with pkgs.xorg; [ xf86videoati glamoregl ]; }; - intel = { modules = with pkgs.xorg; [ xf86videointel glamoregl ]; }; + ati = { modules = with pkgs.xorg; [ xf86videoati ]; }; + intel = { modules = with pkgs.xorg; [ xf86videointel ]; }; modesetting = { modules = []; }; }; @@ -512,7 +512,7 @@ in XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ] + [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; |