alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

shotcut: 17.02 -> 17.09

Browse source 
fixes the previously broken build
This commit is contained in:
Robin Gloster 2017-09-27 00:50:42 +02:00
parent 9824ca6975
commit 1a681a6ecb
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/video/shotcut/default.nix
View file

@ -1,26 +1,29 @@
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
qtgraphicaleffects,
qmake, makeWrapper }:
{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
, qtgraphicaleffects, libmlt
, qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
version = "17.02";
version = "17.09";
src = fetchurl {
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "061jmk1g2h7p82kyk2zgk19g0y3dgx3lppfnm6cdmi550b51qllb";
};
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
buildInputs = [
SDL frei0r gettext mlt
SDL2 frei0r gettext mlt libmlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
qtgraphicaleffects
];
NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin
'';
meta = with stdenv.lib; {

4
pkgs/top-level/all-packages.nix
View file

@ -15608,7 +15608,9 @@ with pkgs;
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
shotcut = libsForQt5.callPackage ../applications/video/shotcut {
libmlt = mlt;
};
smplayer = libsForQt5.callPackage ../applications/video/smplayer { };