nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/opentabletdriver: Match OTD Upstream systemd environment checks (#543033)

Browse Source
This commit is contained in:
Thiago Kenji Okada
2026-07-20 18:59:56 +00:00
committed by GitHub
parent 19a8955127 69a7ab07fc
commit 782014a659
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/hardware/opentabletdriver.nix
View File

@@ -61,16 +61,27 @@ in
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
unitConfig = {
After = "graphical-session.target";
ConditionEnvironment = [
"|WAYLAND_DISPLAY"
"|DISPLAY"
];
};
serviceConfig = {
Type = "simple";
# workaround for https://github.com/NixOS/nixpkgs/issues/469340
ExecStartPre = pkgs.writeShellScript "disable-for-gdm-greeter" ''
if [[ "$USER" = "gdm-greeter"* ]]; then
# workaround for https://github.com/NixOS/nixpkgs/issues/469340 and
# https://github.com/OpenTabletDriver/OpenTabletDriver/issues/4885
ExecStartPre = pkgs.writeShellScript "poll-for-non-gdm-greeter-display" ''
if [[ "$USER" = "gdm-greeter"* \
|| ( "$${XDG_SESSION_TYPE}" = wayland && -z "$${WAYLAND_DISPLAY}" ) ]]; then
exit 1
fi
'';
ExecStart = lib.getExe' cfg.package "otd-daemon";
Restart = "on-failure";
RestartSec = 3;
};
};
};