diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2013-09-09 09:22:08 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-12 10:09:53 +0200 |
| commit | 3a1024478a77c8a662ff8d8b55e2f117e9c94e2f (patch) | |
| tree | d455b55bf851abfcf123d3ebc9ba06a463471a17 | |
| parent | 1103ba84fde35acef6207ecf40c4a4fc40fd9b39 (diff) | |
| download | nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar.gz nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar.bz2 nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar.lz nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar.xz nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.tar.zst nixlib-3a1024478a77c8a662ff8d8b55e2f117e9c94e2f.zip | |
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.
| -rw-r--r-- | modules/services/x11/display-managers/lightdm.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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} ''; |