Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 635e3b1e6fd7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70de27bbb475
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 18, 2019

  1. jellyfin: add bundled libraries to LD_LIBRARY_PATH

    @minijackson
    minijackson committed May 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    minijackson Rémi NICOLE
    GPG key ID: FEA888C9F5D64F62
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5251cbb View commit details

Commits on Jun 8, 2019

  1. Merge pull request #61668 from minijackson/jellyfin-skia 

    jellyfin: add bundled libraries to LD_LIBRARY_PATH
    @matthewbauer
    matthewbauer authored Jun 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    70de27b View commit details
Showing with 21 additions and 5 deletions.
  1. +21 −5 pkgs/servers/jellyfin/default.nix
26 changes: 21 additions & 5 deletions pkgs/servers/jellyfin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }:

stdenv.mkDerivation rec {
{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg,
fontconfig, freetype }:

let
os = if stdenv.isDarwin then "osx" else "linux";
arch =
with stdenv.hostPlatform;
if isx86_32 then "x86"
else if isx86_64 then "x64"
else if isAarch32 then "arm"
else if isAarch64 then "arm64"
else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown";
musl = lib.optionalString stdenv.hostPlatform.isMusl
(if (arch != "x64")
then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-"
else "musl-");
runtimeDir = "${os}-${musl}${arch}";

in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.3.4";

@@ -28,8 +44,8 @@ stdenv.mkDerivation rec {
makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
sqlite
]}" \
sqlite fontconfig freetype stdenv.cc.cc.lib
]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \
--add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
'';