diff options
author | Christian Kögler <christian.koegler@esg.de> | 2020-03-22 09:49:08 +0100 |
---|---|---|
committer | Christian Kögler <christian.koegler@esg.de> | 2020-03-22 12:47:25 +0100 |
commit | 8f12a72488a508a6f477581ad9dfc49250e3e040 (patch) | |
tree | 56b6215661388ecd66776b0de3d4403c48a7d140 | |
parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) |
kodi: fix lirc support
* adapted to the way kodi finds the lircd socket * added lirc package to build support for lirc
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kodi.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index 65a7b9c628e52..e997b9a11343b 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -20,7 +20,7 @@ in services.xserver.desktopManager.session = [{ name = "kodi"; start = '' - ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone & + LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone & waitPID=$! ''; }]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index eef390d30ed88..cacad5969e46b 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -19,6 +19,7 @@ , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, lirc , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -168,6 +169,7 @@ in stdenv.mkDerivation { libcrossguid cwiid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp ffmpeg flatbuffers fmt fstrcmp rapidjson + lirc # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus @@ -211,7 +213,6 @@ in stdenv.mkDerivation { "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" - "-DLIRC_DEVICE=/run/lirc/lircd" ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" |