public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42300 from woffs/shotcut-180602-qt511

Browse Source 
shotcut: 18.06.02 -> 18.05.08
This commit is contained in:
Jörg Thalheim 2018-06-20 22:04:42 +01:00 committed by GitHub
commit 80fa12f1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/shotcut/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
, qtgraphicaleffects, libmlt , qtgraphicaleffects, libmlt
, qmake, makeWrapper }: , qmake, makeWrapper, fetchpatch, qttools }:
assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shotcut-${version}"; name = "shotcut-${version}";
version = "18.05.08"; version = "18.06.02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "shotcut"; repo = "shotcut";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk"; sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
]; ];
NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ];
prePatch = '' prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
@ -34,6 +35,12 @@ stdenv.mkDerivation rec {
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
''; '';
patches = [ (fetchpatch {
url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch;
name = "qt511.patch";
sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9";
} ) ];
postInstall = '' postInstall = ''
mkdir -p $out/share/shotcut mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/ cp -r src/qml $out/share/shotcut/