From ff95916d557168863f4b2bd67ca44ca1ddb72470 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Mon, 28 Aug 2023 01:44:59 +0100 Subject: [PATCH 1/2] olive-editor: 2023-03-20 -> 2023-06-12 --- pkgs/applications/video/olive-editor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index fed5ec99ab00..419876236f78 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { pname = "olive-editor"; - version = "unstable-2023-03-20"; + version = "unstable-2023-06-12"; src = fetchFromGitHub { fetchSubmodules = true; owner = "olive-editor"; repo = "olive"; - rev = "8ca16723613517c41304de318169d27c571b90af"; - sha256 = "sha256-lL90+8L7J7pjvhbqfeIVF0WKgl6qQzNun8pL9YPL5Is="; + rev = "2036fffffd0e24b7458e724b9084ae99c9507c64"; + sha256 = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; }; cmakeFlags = [ From 0289185cc83d5348e37c5c9dbba9fb7b84fd939b Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Fri, 1 Sep 2023 19:46:16 +0100 Subject: [PATCH 2/2] olive-editor: remove obsolete substituteInPlace QStringRef is no longer incorrectly used in these places upstream --- pkgs/applications/video/olive-editor/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 419876236f78..e90781c3d976 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -37,10 +37,6 @@ stdenv.mkDerivation { # 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