From 4d496b29af7e1a5f6e1a21d47c2ef8417e22e4ff Mon Sep 17 00:00:00 2001
From: Colin Arnott <colin@urandom.co.uk>
Date: Mon, 26 Dec 2022 23:27:19 +0000
Subject: [PATCH] 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
---
 pkgs/servers/olaris/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/olaris/default.nix b/pkgs/servers/olaris/default.nix
index 2561fed1dc60..29966aadc692 100644
--- a/pkgs/servers/olaris/default.nix
+++ b/pkgs/servers/olaris/default.nix
@@ -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";
+    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; {