From d1228f95e9023f4283220f11d2213b0af26216ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 26 Mar 2017 18:15:14 +0200
Subject: [PATCH] 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.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 1bf4fd3c089e..6c63fede857f 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";