From 3a1024478a77c8a662ff8d8b55e2f117e9c94e2f Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Sep 2013 09:22:08 +0100
Subject: [PATCH] lightdm: Use xserver.nix environment variables when starting
 X

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.
---
 modules/services/x11/display-managers/lightdm.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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