diff options
| author | Frank Doepper <fd@taz.de> | 2018-06-20 14:00:31 +0200 |
|---|---|---|
| committer | Frank Doepper <fd@taz.de> | 2018-06-20 14:00:31 +0200 |
| commit | e0d0460d0793a41c013e74e7f85e7dab76c5dea7 (patch) | |
| tree | 5e2dd6086f755590c6192bccebf65f4c56f459e6 /pkgs/applications/video/shotcut | |
| parent | d5437a2d673320e9c854b08f82ef4e00dd288daf (diff) | |
shotcut: 18.06.02 -> 18.05.08
also patched to build with qt511, see
https://github.com/mltframework/shotcut/issues/590
Diffstat (limited to 'pkgs/applications/video/shotcut')
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6572164c797e..710510144c80 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtgraphicaleffects, libmlt -, qmake, makeWrapper }: +, qmake, makeWrapper, fetchpatch, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.05.08"; + version = "18.06.02"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk"; + sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v"; }; enableParallelBuilding = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; + qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; + patchFlags = "-p0"; + patches = [ (fetchpatch { + url = https://github.com/mltframework/shotcut/files/2075592/shotcut-18.06.02-qt.patch.txt; + name = "qt511.patch"; + sha256 = "0kxpj2724zm2ka4y1yhfkjglri3p0ck459g93i814pv0j5wqs590"; + } ) ]; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ |