diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-26 18:15:14 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-27 17:21:32 +0200 |
| commit | 3a00742421dc9958ff1632e4e7f1d5495446ec9a (patch) | |
| tree | a53a863b7d152f30cb21e863d85ad5b7fce37d4a /nixos | |
| parent | 0d3b0920a95c46c2d0384498cab4f38ce9fc884e (diff) | |
Revert "Revert "gdm module: only make xserver args overrideable""
This reverts commit 4e57e7f7c6db9a9c00f527eff80cb37890ba516d. This actually broke gnome3 and didn't fix anything, I failed bisecting. (cherry picked from commit d1228f95e9023f4283220f11d2213b0af26216ba)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 1bf4fd3c089e2..6c63fede857ff 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -99,7 +99,8 @@ in services.xserver.displayManager.job = { 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}"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; |