Merge pull request #148091 from rvl/update-restream
This commit is contained in:
commit
4e7f6d3e17
|
@ -5,22 +5,21 @@
|
|||
, ffmpeg-full
|
||||
, fetchFromGitHub
|
||||
, openssh
|
||||
, netcat
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "restream";
|
||||
version = "1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rien";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "18z17chl7r5dg12xmr3f9gbgv97nslm8nijigd03iysaj6dhymp3";
|
||||
sha256 = "0vyj0kng8c9inv2rbw1qdr43ic15s5x8fvk9mbw0vpc6g723x99g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
|
@ -33,10 +32,22 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# `ffmpeg-full` is used here to bring in `ffplay`, which is used to display
|
||||
# the reMarkable framebuffer
|
||||
wrapProgram "$out/bin/restream" --suffix PATH ":" "${lib.makeBinPath [ ffmpeg-full lz4 openssh ]}"
|
||||
postInstall = let
|
||||
deps = [
|
||||
# `ffmpeg-full` is used here to bring in `ffplay`, which is used
|
||||
# to display the reMarkable framebuffer
|
||||
ffmpeg-full
|
||||
lz4
|
||||
openssh
|
||||
# Libressl netcat brings in `nc` which used for --uncompressed mode.
|
||||
netcat
|
||||
];
|
||||
in ''
|
||||
# This `sed` command has the same effect as `wrapProgram`, except
|
||||
# without .restream-wrapped store paths appearing everywhere.
|
||||
sed -i \
|
||||
'2i export PATH=$PATH''${PATH:+':'}${lib.makeBinPath deps}' \
|
||||
"$out/bin/restream"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue