From 6977b94e9b5e7889c1190df065e5e58ab3c6e553 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 28 Oct 2016 18:15:40 +0200
Subject: [PATCH] Revert "xserverArgs fuckup"

This reverts commit c2922a9157a8d8db62cee763e254113c3766461e.

See https://github.com/NixOS/nixpkgs/issues/19930

While the above commit is designed to allow GDM to work, it appears to
break other use cases.  In particular, it breaks tests involving X
usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess
the impact of other changes and so hampers development of unrelated
features.

https://hydra.nixos.org/build/42852015
https://hydra.nixos.org/build/42851666
---
 nixos/modules/services/x11/xserver.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index db60e47c3ea..f5ed5233818 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -547,19 +547,18 @@ in
         };
       };
 
-    services.xserver.displayManager.xserverArgs = mkDefault (
-      [ #"-terminate"
+    services.xserver.displayManager.xserverArgs =
+      [ "-terminate"
         "-config ${configFile}"
         "-xkbdir" "${cfg.xkbDir}"
         # Log at the default verbosity level to stderr rather than /var/log/X.*.log.
-        #"-verbose" "3" "-logfile" "/dev/null"
-      ] #++ optional (cfg.display != null) ":${toString cfg.display}"
-        #++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
+        "-verbose" "3" "-logfile" "/dev/null"
+      ] ++ optional (cfg.display != null) ":${toString cfg.display}"
+        ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
         ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"
-        #++ optional (!cfg.enableTCP) "-nolisten tcp");
+        ++ optional (!cfg.enableTCP) "-nolisten tcp"
         ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
-        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
-);
+        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}";
 
     services.xserver.modules =
       concatLists (catAttrs "modules" cfg.drivers) ++