ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Revert "gdm module: only make xserver args overrideable"

Browse Source 
This reverts commit a5aa926902.

This allows gdm to run again, the test is still failing.
This commit is contained in:
Robin Gloster 2017-03-24 10:34:40 +01:00
parent 6fe465f500
commit 4e57e7f7c6
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 1 additions and 2 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,8 +99,7 @@ in
services.xserver.displayManager.job = services.xserver.displayManager.job =
{ {
environment = { environment = {
GDM_X_SERVER_EXTRA_ARGS = toString GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}";
(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";