From b5519d6089eafcfbb3fbf177d63ad94590699223 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 22 Mar 2023 22:57:57 +0000
Subject: [PATCH] olive-editor: 1.2 -> 2023-03-20

Co-authored-by: Arnout Engelen <arnout@bzzt.net>
---
 .../video/olive-editor/default.nix            | 57 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index 87056a1598d7..5a24066bf4b8 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -1,34 +1,69 @@
-{ lib, stdenv, fetchFromGitHub
-, pkg-config, which, qmake, wrapQtAppsHook
-, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, which
+, frei0r
+, opencolorio
+, ffmpeg-full
+, CoreFoundation
+, cmake
+, wrapQtAppsHook
+, openimageio2
+, openexr_3
+, portaudio
+, imath
+, qtwayland
+, qtmultimedia
+, qttools
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "olive-editor";
-  version = "0.1.2";
+  version = "unstable-2023-03-20";
 
   src = fetchFromGitHub {
+    fetchSubmodules = true;
     owner = "olive-editor";
     repo = "olive";
-    rev = version;
-    sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a";
+    rev = "8ca16723613517c41304de318169d27c571b90af";
+    sha256 = "sha256-lL90+8L7J7pjvhbqfeIVF0WKgl6qQzNun8pL9YPL5Is=";
   };
 
-  patches = [
-    ./q-painter-path.patch
+  cmakeFlags = [
+    "-DBUILD_QT6=1"
   ];
 
+  # https://github.com/olive-editor/olive/issues/2200
+  patchPhase = ''
+    runHook prePatch
+    substituteInPlace ./app/node/project/serializer/serializer.h \
+      --replace 'QStringRef' 'QStringView'
+    substituteInPlace ./app/node/project/serializer/serializer.cpp \
+      --replace 'QStringRef' 'QStringView'
+    substituteInPlace ./app/node/project/serializer/serializer230220.cpp \
+      --replace 'QStringRef' 'QStringView'
+    runHook postPatch
+  '';
+
   nativeBuildInputs = [
     pkg-config
     which
-    qmake
+    cmake
     wrapQtAppsHook
   ];
 
   buildInputs = [
     ffmpeg-full
     frei0r
-    opencolorio_1
+    opencolorio
+    openimageio2
+    imath
+    openexr_3
+    portaudio
+    qtwayland
     qtmultimedia
+    qttools
   ] ++ lib.optional stdenv.isDarwin CoreFoundation;
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c1bbf65eb8e..acd61b20b704 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10563,7 +10563,7 @@ with pkgs;
 
   ola = callPackage ../applications/misc/ola { };
 
-  olive-editor = libsForQt5.callPackage ../applications/video/olive-editor {
+  olive-editor = qt6Packages.callPackage ../applications/video/olive-editor {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };