about summary refs log tree commit diff
path: root/pkgs/applications/video/olive-editor/default.nix
diff options
context:
space:
mode:
authorTobias Mayer <tobim@fastmail.fm>2023-10-25 05:53:12 +0200
committerTobias Mayer <tobim@fastmail.fm>2023-11-04 06:01:24 +0100
commit25fdcb4af94c094e5b29fa11a2e7b09dcefd9e4c (patch)
tree86985cca9c3ed2a45f9314a782eea34380247002 /pkgs/applications/video/olive-editor/default.nix
parent77083d8d513b1e553efa6203ef57b3df8ad72b8f (diff)
olive-editor: patch for opencolorio-2.3
Diffstat (limited to 'pkgs/applications/video/olive-editor/default.nix')
-rw-r--r--pkgs/applications/video/olive-editor/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index e90781c3d976f..5daac65313e82 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , pkg-config
 , which
 , frei0r
@@ -34,12 +35,19 @@ stdenv.mkDerivation {
     "-DBUILD_QT6=1"
   ];
 
+  patches = [
+    (fetchpatch {
+      # Taken from https://github.com/olive-editor/olive/pull/2294.
+      name = "olive-editor-openimageio-2.3-compat.patch";
+      url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
+      hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
+    })
+  ];
+
   # https://github.com/olive-editor/olive/issues/2200
-  patchPhase = ''
-    runHook prePatch
+  postPatch = ''
     substituteInPlace ./app/node/project/serializer/serializer230220.cpp \
       --replace 'QStringRef' 'QStringView'
-    runHook postPatch
   '';
 
   nativeBuildInputs = [