[Service]
User=kodi
Group=kodi
-Environment=XDG_RUNTIME_DIR=/tmp
-EnvironmentFile=-/etc/conf.d/kodi-standalone
-TTYPath=/dev/tty1
+
+# It seems that udev events aren't propagated to sdl within nspawn. So udev hotplug doesn't work.
+# SDL offers alternative methods to discover new devices, inotify and polling, use one of those.
+Environment=SDL_JOYSTICK_DISABLE_UDEV=1
Environment=WINDOWING=wayland
+
+RuntimeDirectory=kodi
+Environment=XDG_RUNTIME_DIR=%t/kodi
+
ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone
-ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-x11
+ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-wayland
Restart=on-abort
+
+TTYPath=/dev/tty1
StandardInput=tty
StandardOutput=journal