Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kodi: fix lirc support #83131

Merged
merged 1 commit into from Mar 22, 2020
Merged

kodi: fix lirc support #83131

merged 1 commit into from Mar 22, 2020

Conversation

ck3d
Copy link
Contributor

@ck3d ck3d commented Mar 22, 2020

  • adapted to the way kodi finds the lircd socket
  • added lirc package to build support for lirc
Motivation for this change

Fix lirc support for Kodi.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ckesg
kodi: fix lirc support
8f12a72 
* adapted to the way kodi finds the lircd socket
* added lirc package to build support for lirc
markuskowa
markuskowa reviewed Mar 22, 2020
View reviewed changes
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 &
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did that change with an upgrade of Kodi?

Copy link
Contributor Author

@ck3d ck3d Mar 22, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lirc in Kodi is broken in nixos since more than two releases.

The argument --lircdev was removed with following commit, but broke lirc support:
xbmc/xbmc@6e156be

and following commit fixed it again:
xbmc/xbmc@4ad8df6

These commits are both 2 years old.

@markuskowa markuskowa added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 22, 2020
@markuskowa markuskowa merged commit 667df74 into NixOS:master Mar 22, 2020
@markuskowa
Copy link
Member

back ported to 20.03 in db4300a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markuskowa markuskowa markuskowa left review comments

@titanous titanous Awaiting requested review from titanous

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@domenkozar domenkozar Awaiting requested review from domenkozar

@sephalon sephalon Awaiting requested review from sephalon

@edwtjo edwtjo Awaiting requested review from edwtjo

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ck3d @markuskowa @ckesg