public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
kodi: fix lirc support
This commit is contained in:
markuskowa 2020-03-22 21:29:45 +01:00 committed by GitHub
commit 667df74501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/kodi.nix
View File

@ -20,7 +20,7 @@ in
services.xserver.desktopManager.session = [{ services.xserver.desktopManager.session = [{
name = "kodi"; name = "kodi";
start = '' start = ''
${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone & LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone &
waitPID=$! waitPID=$!
''; '';
}]; }];

3
pkgs/applications/video/kodi/default.nix
View File

@ -19,6 +19,7 @@
, libcrossguid, libmicrohttpd , libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
, lirc
, dbusSupport ? true, dbus ? null , dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null , joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null , nfsSupport ? true, libnfs ? null
@ -168,6 +169,7 @@ in stdenv.mkDerivation {
libcrossguid cwiid libplist libcrossguid cwiid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
ffmpeg flatbuffers fmt fstrcmp rapidjson ffmpeg flatbuffers fmt fstrcmp rapidjson
lirc
# libdvdcss libdvdnav libdvdread # libdvdcss libdvdnav libdvdread
] ]
++ lib.optional dbusSupport dbus ++ lib.optional dbusSupport dbus
@ -202,7 +204,6 @@ in stdenv.mkDerivation {
"-DENABLE_EVENTCLIENTS=ON" "-DENABLE_EVENTCLIENTS=ON"
"-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_INTERNAL_CROSSGUID=OFF"
"-DENABLE_OPTICAL=ON" "-DENABLE_OPTICAL=ON"
"-DLIRC_DEVICE=/run/lirc/lircd"
] ++ lib.optional useWayland [ ] ++ lib.optional useWayland [
"-DCORE_PLATFORM_NAME=wayland" "-DCORE_PLATFORM_NAME=wayland"
"-DWAYLAND_RENDER_SYSTEM=gl" "-DWAYLAND_RENDER_SYSTEM=gl"