From 4e57e7f7c6db9a9c00f527eff80cb37890ba516d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 24 Mar 2017 10:34:40 +0100
Subject: Revert "gdm module: only make xserver args overrideable"

This reverts commit a5aa9269027d638b80fe1f23bcf8887ca80d034b.

This allows gdm to run again, the test is still failing.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857f..1bf4fd3c089e 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -99,8 +99,7 @@ in
     services.xserver.displayManager.job =
       {
         environment = {
-          GDM_X_SERVER_EXTRA_ARGS = toString
-            (filter (arg: arg != "-terminate") cfg.xserverArgs);
+          GDM_X_SERVER = "${cfg.xserverBin} ${toString cfg.xserverArgs}";
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
-- 
cgit 1.4.1