From 4f1639bc516f59e62be6b381e9cdbf7fdbdc55ac Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 27 Sep 2020 21:21:55 +0200 Subject: [PATCH] shotcut: 20.09.13 -> 20.10.31 see https://github.com/mltframework/shotcut/releases also disable upgrade prompt as suggested by @ddennedy in https://github.com/NixOS/nixpkgs/issues/99851 --- pkgs/applications/video/shotcut/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index f1d77fb7d14..188d49a791e 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -9,13 +9,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.09.13"; + version = "20.10.31"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; + sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6"; }; enableParallelBuilding = true; @@ -27,7 +27,11 @@ mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; + qmakeFlags = [ + "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "SHOTCUT_VERSION=${version}" + "DEFINES+=SHOTCUT_NOUPGRADE" + ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp