emby: use makeWrapper to supply ffmpeg/probe paths
Fixes NixOS/nixpkgs#19118
This commit is contained in:
parent
08cb89ae19
commit
81ff763541
@ -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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -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 = "1j1fa54as8s75qky5gw9bw3b19mgn72nv89ip2hgln6bjv1b40jq";
|
sha256 = "1j1fa54as8s75qky5gw9bw3b19mgn72nv89ip2hgln6bjv1b40jq";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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 = {
|
||||||
|
Loading…
Reference in New Issue
Block a user