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

Revert "Revert "gdm module: only make xserver args overrideable"" 

This reverts commit 4e57e7f7c6.

This actually broke gnome3 and didn't fix anything, I failed bisecting.
This commit is contained in:
Robin Gloster 2017-03-26 18:15:14 +02:00
parent d8dd2fb9e5
commit d1228f95e9
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,8 @@ in
services.xserver.displayManager.job = services.xserver.displayManager.job =
{ {
environment = { environment = {
GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}"; GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}";
# Find the mouse # Find the mouse
XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";