diff options
author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 16:36:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 16:36:14 +0200 |
commit | d153c195ca23738fbff71f48a767a3ac4567c423 (patch) | |
tree | 294a3f7b36b3397371cd8f35567a25960f76ca6c /pkgs/servers | |
parent | 34767dec2158c511cdecfe11ec3e696d05aca49a (diff) | |
parent | 81ff7635416d66ea613ec871d1ece0130149ab00 (diff) | |
download | nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar.gz nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar.bz2 nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar.lz nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar.xz nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.tar.zst nixlib-d153c195ca23738fbff71f48a767a3ac4567c423.zip |
Merge pull request #19190 from mayflower/emby_fix_ffmpeg_detection
emby: use makeWrapper to supply ffmpeg/probe paths
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/emby/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index b1667bd3366b..0a6bcdc72af6 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, ... }: +{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk"; }; + buildInputs = with pkgs; [ + makeWrapper + ]; propagatedBuildInputs = with pkgs; [ mono sqlite @@ -23,6 +26,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $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 = { |