tv xserver: drop wrapper
This commit is contained in:
parent
73a6331225
commit
f48cd0f2a3
@ -73,7 +73,15 @@ let
|
|||||||
environment = xserver-environment;
|
environment = xserver-environment;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecReload = need-reload "xserver.service";
|
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));
|
++ 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
|
need-reload = s: let
|
||||||
pkg = pkgs.writeScriptBin "need-reload" ''
|
pkg = pkgs.writeScriptBin "need-reload" ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
Loading…
Reference in New Issue
Block a user