git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #83131 from ck3d/fix-kodi-lirc

kodi: fix lirc support

commit667df74501281062a3af9e7a4e76762a4370b5fc authormarkuskowa <markus.kowalewski@gmail.com> dateSun 22 Mar 2020, 21:29 (7 years ago) parentca7f78a8f12a72
2 files changed+3−2
nixos/modules/services/x11/desktop-managers/kodi.nix+1−1 pkgs/applications/video/kodi/default.nix+2−1
nixos/modules/services/x11/desktop-managers/kodi.nix+1−1
@@ -20,7 +20,7 @@ in
2020 services.xserver.desktopManager.session = [{
2121 name = "kodi";
2222 start = ''
23− ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone &
23+ LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone &
2424 waitPID=$!
2525 '';
2626 }];
pkgs/applications/video/kodi/default.nix+2−1
@@ -19,6 +19,7 @@
1919, libcrossguid, libmicrohttpd
2020, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
2121, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
22+, lirc
2223, dbusSupport ? true, dbus ? null
2324, joystickSupport ? true, cwiid ? null
2425, nfsSupport ? true, libnfs ? null
@@ -168,6 +169,7 @@ in stdenv.mkDerivation {
168169 libcrossguid cwiid libplist
169170 bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
170171 ffmpeg flatbuffers fmt fstrcmp rapidjson
172+ lirc
171173 # libdvdcss libdvdnav libdvdread
172174 ]
173175 ++ lib.optional dbusSupport dbus
@@ -202,7 +204,6 @@ in stdenv.mkDerivation {
202204 "-DENABLE_EVENTCLIENTS=ON"
203205 "-DENABLE_INTERNAL_CROSSGUID=OFF"
204206 "-DENABLE_OPTICAL=ON"
205− "-DLIRC_DEVICE=/run/lirc/lircd"
206207 ] ++ lib.optional useWayland [
207208 "-DCORE_PLATFORM_NAME=wayland"
208209 "-DWAYLAND_RENDER_SYSTEM=gl"