pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #83131 from ck3d/fix-kodi-lirc

kodi: fix lirc support

authored by markuskowa and committed by GitHub 667df745 ca7f78ad

+3 -2
unified split
+1 -1
nixos/modules/services/x11/desktop-managers/kodi.nix
··· 20 services.xserver.desktopManager.session = [{ 21 name = "kodi"; 22 start = '' 23 - ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone & 24 waitPID=$! 25 ''; 26 }];
··· 20 services.xserver.desktopManager.session = [{ 21 name = "kodi"; 22 start = '' 23 + LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone & 24 waitPID=$! 25 ''; 26 }];
+2 -1
pkgs/applications/video/kodi/default.nix
··· 19 , libcrossguid, libmicrohttpd 20 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp 21 , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson 22 , dbusSupport ? true, dbus ? null 23 , joystickSupport ? true, cwiid ? null 24 , nfsSupport ? true, libnfs ? null ··· 168 libcrossguid cwiid libplist 169 bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp 170 ffmpeg flatbuffers fmt fstrcmp rapidjson 171 # libdvdcss libdvdnav libdvdread 172 ] 173 ++ lib.optional dbusSupport dbus ··· 202 "-DENABLE_EVENTCLIENTS=ON" 203 "-DENABLE_INTERNAL_CROSSGUID=OFF" 204 "-DENABLE_OPTICAL=ON" 205 - "-DLIRC_DEVICE=/run/lirc/lircd" 206 ] ++ lib.optional useWayland [ 207 "-DCORE_PLATFORM_NAME=wayland" 208 "-DWAYLAND_RENDER_SYSTEM=gl"
··· 19 , libcrossguid, libmicrohttpd 20 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp 21 , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson 22 + , lirc 23 , dbusSupport ? true, dbus ? null 24 , joystickSupport ? true, cwiid ? null 25 , nfsSupport ? true, libnfs ? null ··· 169 libcrossguid cwiid libplist 170 bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp 171 ffmpeg flatbuffers fmt fstrcmp rapidjson 172 + lirc 173 # libdvdcss libdvdnav libdvdread 174 ] 175 ++ lib.optional dbusSupport dbus ··· 204 "-DENABLE_EVENTCLIENTS=ON" 205 "-DENABLE_INTERNAL_CROSSGUID=OFF" 206 "-DENABLE_OPTICAL=ON" 207 ] ++ lib.optional useWayland [ 208 "-DCORE_PLATFORM_NAME=wayland" 209 "-DWAYLAND_RENDER_SYSTEM=gl"