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

lightdm: Use xserver.nix environment variables when starting X

Browse Source 
This reduces code duplication, but more importantly means that the
DRI modules can be found by X enabling hardware acceleration.

Close #249; the PR also refers to more about DRI modules.
This commit is contained in:
Oliver Charles 2013-09-09 09:22:08 +01:00 committed by Vladimír Čunát
parent 1103ba84fd
commit 3a1024478a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/services/x11/display-managers/lightdm.nix
View File

@ -5,6 +5,7 @@ with pkgs.lib;
let let
dmcfg = config.services.xserver.displayManager; dmcfg = config.services.xserver.displayManager;
xEnv = config.systemd.services."display-manager".environment;
cfg = dmcfg.lightdm; cfg = dmcfg.lightdm;
inherit (pkgs) stdenv lightdm writeScript writeText; inherit (pkgs) stdenv lightdm writeScript writeText;
@ -13,7 +14,7 @@ let
xserverWrapper = writeScript "xserver-wrapper" xserverWrapper = writeScript "xserver-wrapper"
'' ''
#! /bin/sh #! /bin/sh
export XKB_BINDIR="${pkgs.xorg.xkbcomp}/bin" ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
''; '';