From 7ccd47f80e101dcc3406b071de2a51577e04fc26 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 27 Sep 2020 21:21:55 +0200 Subject: shotcut: 20.10.31 -> 20.11.25 - see https://github.com/mltframework/shotcut/releases - reformat - remove qtwebkit - qtquickcontrols -> qtquickcontrols2 --- pkgs/applications/video/shotcut/default.nix | 43 +++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/video/shotcut/default.nix') diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index fee41ed3ef0..7db2d0df738 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,6 +1,23 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt -, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater +{ stdenv +, fetchFromGitHub +, fetchpatch +, mkDerivation +, SDL2 +, frei0r +, gettext +, mlt +, jack1 +, pkgconfig +, qtbase +, qtmultimedia +, qtx11extras +, qtwebsockets +, qtquickcontrols2 +, qtgraphicaleffects +, libmlt +, qmake +, qttools +, genericUpdater , common-updater-scripts }: @@ -9,20 +26,28 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.10.31"; + version = "20.11.25"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6"; + sha256 = "1nm71gnjd082m7bxlmrkngn079m3fdrb059f7wy23qj7khgpi3iz"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - SDL2 frei0r gettext mlt libmlt - qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols + SDL2 + frei0r + gettext + mlt + libmlt + qtbase + qtmultimedia + qtx11extras + qtwebsockets + qtquickcontrols2 qtgraphicaleffects ]; @@ -43,9 +68,9 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}" "--prefix PATH : ${mlt}/bin" - ]; + ]; postInstall = '' mkdir -p $out/share/shotcut -- cgit 1.4.1