Unverified Commit 51e2dfe8 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #251871 from MatthewCroughan/mc/update-olive 

olive-editor: 2023-03-20 -> 2023-06-12
parents be86567a 0289185c

pkgs/applications/video/olive-editor/default.nix

+3 −7
Original line number Diff line number Diff line
@@ -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 = [
@@ -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