Skip to content

Commit

Permalink
ffmpeg-livepeer: init at 7.0.1; livepeer: 0.5.20 -> 0.8.0 (#354396)
Browse files Browse the repository at this point in the history
  • Loading branch information
wegank authored Nov 13, 2024
2 parents 50eb4d0 + a22d388 commit 7ae1889
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 13 deletions.
29 changes: 29 additions & 0 deletions pkgs/by-name/ff/ffmpeg-livepeer/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
ffmpeg_7-headless,
lib,
fetchFromGitHub,
}:

(ffmpeg_7-headless.override {
version = "7.0.1-unstable-2024-07-10";
withCudaLLVM = true;
source = fetchFromGitHub {
owner = "livepeer";
repo = "FFmpeg";
rev = "d9751c73e714b01b363483db358b1ea8022c9bea"; # From branch n*-livepeer
hash = "sha256-IJVpb/k+obGFD9uOoIVHCd2ZiGL3CA4CV3D+Q9vMbQM=";
};
}).overrideAttrs
(old: {
pname = "ffmpeg-livepeer";

meta = {
inherit (old.meta)
license
mainProgram
pkgConfigModules
platforms
;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
})
45 changes: 32 additions & 13 deletions pkgs/by-name/li/livepeer/package.nix
Original file line number Diff line number Diff line change
@@ -1,33 +1,52 @@
{ lib, fetchFromGitHub, buildGoModule
, pkg-config, ffmpeg, gnutls
{
lib,
fetchFromGitHub,
buildGoModule,
pkg-config,
ffmpeg-livepeer,
gnutls,
nix-update-script,
}:

buildGoModule rec {
pname = "livepeer";
version = "0.5.20";
version = "0.8.0";

proxyVendor = true;
vendorHash = "sha256-aRZoAEnRai8i5H08ReW8lEFlbmarYxU0lBRhR/Llw+M=";
vendorHash = "sha256-FCTdPVa10/DUYYuZDLtZsrCXCRoDRfuvnkzhmHJNvrk=";

src = fetchFromGitHub {
owner = "livepeer";
repo = "go-livepeer";
rev = "v${version}";
sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU=";
rev = "refs/tags/v${version}";
hash = "sha256-UVL5y8z62pHi0mLueIp+iBxtzGf57LpGh+Czwg2pV0Q=";
};

# livepeer_cli has a vendoring problem
subPackages = [ "cmd/livepeer" ];
nativeBuildInputs = [
pkg-config
];

nativeBuildInputs = [ pkg-config ];
buildInputs = [
ffmpeg-livepeer
gnutls
];

buildInputs = [ ffmpeg gnutls ];
__darwinAllowLocalNetworking = true;

meta = with lib; {
postPatch = ''
rm -rf test/e2e # Require docker
'';

passthru.updateScript = nix-update-script { };

meta = {
description = "Official Go implementation of the Livepeer protocol";
homepage = "https://livepeer.org";
license = licenses.mit;
maintainers = with maintainers; [ elitak ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
elitak
bot-wxt1221
];
mainProgram = "livepeer";
};
}

0 comments on commit 7ae1889

Please sign in to comment.