olaris-server: 0.4.0 -> unstable-2022-06-11

As called out in the linked issue below, olaris-server has a runtime
dependency on ffmpeg. Unfortunately, 0.4.0 requires a custom fork of
ffmpeg. While we could fetch the upstream compiled artefact or build it
ourselves, the former was unpalatable and the latter prohibitively
difficult. As such, we have bumped to the, yet to be released, tip of
the default branch, which has merged support for upstream ffmpeg.

Fixes #207877
This commit is contained in:
Colin Arnott 2022-12-26 23:27:19 +00:00
parent 70c476bbf7
commit 4d496b29af
No known key found for this signature in database
GPG Key ID: 0447A663F7F3E236

View File

@ -1,14 +1,21 @@
{ buildGoModule, fetchFromGitLab, fetchzip, installShellFiles, lib }:
{ buildGoModule
, fetchFromGitLab
, fetchzip
, ffmpeg
, installShellFiles
, lib
, makeWrapper
}:
buildGoModule rec {
pname = "olaris-server";
version = "0.4.0";
version = "unstable-2022-06-11";
src = fetchFromGitLab {
owner = "olaris";
repo = pname;
rev = "v${version}";
hash = "sha256-iworyQqyTabTI0NpZHTdUBGZSCaiC5Dhr69mRtsHLOs=";
rev = "bdb2aeb1595c941210249164a97c12404c1ae0d8";
hash = "sha256-Uhnh6GC85ORKnfHeYNtbSA40osuscxXDF5/kXJrF2Cs=";
};
preBuild = let
@ -29,9 +36,9 @@ buildGoModule rec {
"-X gitlab.com/olaris/olaris-server/helpers.Version=${version}"
];
vendorHash = "sha256-xWywDgw0LzJhPtVK0aGgT0TTanejJ39ZmGc50A3d68U=";
vendorHash = "sha256-bw8zvDGFBci9bELsxAD0otpNocBnO8aAcgyohLZ3Mv0=";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
# integration tests require network access
doCheck = false;
@ -41,6 +48,7 @@ buildGoModule rec {
--bash <($out/bin/olaris-server completion bash) \
--fish <($out/bin/olaris-server completion fish) \
--zsh <($out/bin/olaris-server completion zsh)
wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ffmpeg]}
'';
meta = with lib; {