Updating and fixing shotcut.
This commit is contained in:
commit
762a11a276
|
@ -1,20 +1,26 @@
|
|||
{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase, qmakeHook }:
|
||||
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
|
||||
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquick1, qtquickcontrols,
|
||||
qtgraphicaleffects,
|
||||
qmakeHook, makeQtWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shotcut-${version}";
|
||||
version = "14.09";
|
||||
version = "16.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
|
||||
sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f";
|
||||
sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase qmakeHook ];
|
||||
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
|
||||
qtx11extras qtwebsockets qtquick1 qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/shotcut
|
||||
cp -r src/qml $out/share/shotcut/
|
||||
wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
|
||||
wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -35,6 +41,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# after qt5 bump it probably needs to be updated,
|
||||
# but newer versions seem to need newer than the latest stable mlt
|
||||
broken = true;
|
||||
# broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14078,7 +14078,7 @@ in
|
|||
stdenv = stdenv_32bit;
|
||||
};
|
||||
|
||||
shotcut = qt5.callPackage ../applications/video/shotcut { };
|
||||
shotcut = qt55.callPackage ../applications/video/shotcut { };
|
||||
|
||||
smplayer = qt5.callPackage ../applications/video/smplayer { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue