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

kodiPlugins: fix path for shared object links #26653

Closed
wants to merge 1 commit into from

Conversation

titanous
Copy link
Contributor

Motivation for this change

513e66e broke plugins with shared objects because the path was wrong, this fixes it.

/cc @edwtjo

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -77,7 +77,7 @@ rec {
# them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
installPhase = let n = namespace; in ''
make install
ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}.so
ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version}
Copy link
Member

Choose a reason for hiding this comment

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

Is it possible that sometimes both symlinks are needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so, Kodi looks for this exact path for each plugin.

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
@FRidh
Copy link
Member

FRidh commented Jun 25, 2017

@edwtjo merge?

@edwtjo
Copy link
Member

edwtjo commented Sep 19, 2017

@FRidh @titanous Sorry for letting this slide for so long. Cherry-picked in 1eb9ffc 4197ff7 84bfe7e

@edwtjo edwtjo closed this Sep 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants