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

jellyfin: 10.3.0 -> 10.3.1 #60162

Merged
merged 1 commit into from Apr 28, 2019
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Apr 24, 2019

Motivation for this change

https://github.com/jellyfin/jellyfin/releases/tag/v10.3.1

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Seems to run? O:)


@aanderse
Copy link
Member

@nyanloutre @minijackson care to test and confirm this change?

@minijackson
Copy link
Member

Tested it, works as fine as before ^^

@minijackson
Copy link
Member

Actually, there are a couple of improvements we could use in this package:

  • Jellyfin complains that it can't load the Skia image processing library. The .dll and .so are packaged within Jellyfin's $out directory, so a quick and dirty fix would be (for linux x64):
  installPhase = ''
    install -dm 755 "$out/opt/jellyfin"
    cp -r * "$out/opt/jellyfin"

    makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \
      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
        sqlite fontconfig freetype stdenv.cc.cc.lib
      ]}:$out/opt/jellyfin/runtimes/linux-x64/native/" \
      --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
  '';

Added dependencies into the LD_LIBRARY_PATH specifically for skia's .so

A way better solution would be to package SkiaSharp for NixOS, but I'm not sure there even is support in NixOS for building C# libraries :-/

  • Another thing is that Jellyfin complains about the ffmpeg version, but it wants FFmpeg 4.0 only. Currently NixOS ships with FFmpeg 4.1 and FFmpeg 3.4, which makes Jellyfin complain either way. A discussion is happening here for 4.1 support, but I think the consensus is heading towards them bundling their own version of FFmpeg? Which would make things harder for us 😢 (especially if they remove the --ffmpeg option).

Anyways, sorry to dump it all here, @dtzWill if you have time, could you add the Skia part into your PR? If you don't, or just want to push the version, no worries I'll try to find some time ^^

@aanderse aanderse merged commit a8ab026 into NixOS:master Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants