From 6e8da1ddf0be2d511e82f8a7f40236f3aa03ad3b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 2 Oct 2018 12:13:53 +0200 Subject: [PATCH 1/4] WIP emby: 3.5.2.0 -> 3.5.3.0 --- pkgs/servers/emby/default.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 11cb914bfd8..ab2d5fa08c2 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, mono54, ffmpeg }: +{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.5.2.0"; + version = "3.5.3.0"; # We are fetching a binary here, however, a source build is possible. # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43 @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # This may also need msbuild (instead of xbuild) which isn't in nixpkgs # See -> https://github.com/NixOS/nixpkgs/issues/29817 src = fetchurl { - url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-mono_${version}.zip"; - sha256 = "12f9skvnr9qxnrvr3q014yggfwvkpjk0ynbgf0fwk56h4kal7fx8"; + url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip"; + sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj"; }; buildInputs = [ @@ -21,26 +21,22 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - mono54 + dotnet-sdk sqlite ]; preferLocalBuild = true; - # Need to set sourceRoot as unpacker will complain about multiple directory output - sourceRoot = "."; - buildPhase = '' - substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so - substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" + rm -rf {electron,runtimes} ''; installPhase = '' - mkdir -p "$out/bin" - cp -r * "$out/bin" + install -dm 755 "$out/usr/lib/emby-server" + cp -r * "$out/usr/lib/emby-server" - makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ - --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" + makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ + --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = with stdenv.lib; { From f7a2e2025f0194389e5a77ff15149c72a6262cac Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 2 Oct 2018 12:37:34 +0200 Subject: [PATCH 2/4] emby: add sqlite to wrapper --- pkgs/servers/emby/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index ab2d5fa08c2..61f4ab72130 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { cp -r * "$out/usr/lib/emby-server" makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + sqlite + ]}" \ --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; From 9ec17c6318451c92c8878d9b9a6f72d148832c79 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 3 Oct 2018 09:44:53 +0200 Subject: [PATCH 3/4] emby: move usr/lib to lib --- pkgs/servers/emby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 61f4ab72130..1382e6ecdf2 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -dm 755 "$out/usr/lib/emby-server" - cp -r * "$out/usr/lib/emby-server" + install -dm 755 "$out/lib/emby-server" + cp -r * "$out/lib/emby-server" makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite ]}" \ - --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" + --add-flags "$out/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = with stdenv.lib; { From c2e269ea05df3b427202ab3b3548226942a4694d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 4 Oct 2018 10:12:57 +0200 Subject: [PATCH 4/4] emby: move lib to opt --- pkgs/servers/emby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 1382e6ecdf2..932d070577e 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -dm 755 "$out/lib/emby-server" - cp -r * "$out/lib/emby-server" + install -dm 755 "$out/opt/emby-server" + cp -r * "$out/opt/emby-server" makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite ]}" \ - --add-flags "$out/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" + --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = with stdenv.lib; {