From f48cd0f2a3b9970fee3f4100c9656e6b6b4fd6d8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 25 May 2016 01:50:06 +0200
Subject: tv xserver: drop wrapper

---
 tv/2configs/xserver/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index efc06be14..802542020 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -73,7 +73,15 @@ let
       environment = xserver-environment;
       serviceConfig = {
         ExecReload = need-reload "xserver.service";
-        ExecStart = "${xserver}/bin/xserver";
+        ExecStart = toString [
+          "${pkgs.xorg.xorgserver}/bin/X"
+          ":${toString config.services.xserver.display}"
+          "vt${toString config.services.xserver.tty}"
+          "-config ${import ./xserver.conf.nix args}"
+          "-logfile /var/log/X.${toString config.services.xserver.display}.log"
+          "-nolisten tcp"
+          "-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb"
+        ];
       };
     };
   };
@@ -112,18 +120,6 @@ let
       ++ concatLists (catAttrs "libPath" config.services.xserver.drivers));
   };
 
-  xserver = pkgs.writeScriptBin "xserver" ''
-    #! /bin/sh
-    set -efu
-    exec ${pkgs.xorg.xorgserver}/bin/X \
-        :${toString config.services.xserver.display} \
-        vt${toString config.services.xserver.tty} \
-        -config ${import ./xserver.conf.nix args} \
-        -logfile /var/log/X.${toString config.services.xserver.display}.log \
-        -nolisten tcp \
-        -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb \
-  '';
-
   need-reload = s: let
     pkg = pkgs.writeScriptBin "need-reload" ''
       #! /bin/sh
-- 
cgit v1.2.3