public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19190 from mayflower/emby_fix_ffmpeg_detection 

emby: use makeWrapper to supply ffmpeg/probe paths
This commit is contained in:
Jörg Thalheim 2016-10-03 16:36:14 +02:00 committed by GitHub
parent 34767dec21 81ff763541
commit d153c195ca
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/emby.nix
View File

@ -43,7 +43,7 @@ in
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
PermissionsStartOnly = "true"; PermissionsStartOnly = "true";
ExecStart = "${pkgs.mono}/bin/mono ${pkgs.emby}/bin/MediaBrowser.Server.Mono.exe"; ExecStart = "${pkgs.emby}/bin/MediaBrowser.Server.Mono";
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };

8
pkgs/servers/emby/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs, ... }: { stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emby-${version}"; name = "emby-${version}";
@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk"; sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk";
}; };
buildInputs = with pkgs; [
makeWrapper
];
propagatedBuildInputs = with pkgs; [ propagatedBuildInputs = with pkgs; [
mono mono
sqlite sqlite
@ -23,6 +26,9 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/ cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/
makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
--add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
''; '';
meta = { meta = {