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

Updating and fixing shotcut.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2016-08-18 09:41:29 +02:00
commit 762a11a276
2 changed files with 13 additions and 7 deletions
pkgs
applications/video/shotcut
default.nix
top-level
all-packages.nix

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

@ -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 { stdenv.mkDerivation rec {
name = "shotcut-${version}"; name = "shotcut-${version}";
version = "14.09"; version = "16.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; 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 = '' 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/
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; { meta = with stdenv.lib; {
@ -35,6 +41,6 @@ stdenv.mkDerivation rec {
# after qt5 bump it probably needs to be updated, # after qt5 bump it probably needs to be updated,
# but newer versions seem to need newer than the latest stable mlt # but newer versions seem to need newer than the latest stable mlt
broken = true; # broken = true;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -14078,7 +14078,7 @@ in
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
}; };
shotcut = qt5.callPackage ../applications/video/shotcut { }; shotcut = qt55.callPackage ../applications/video/shotcut { };
smplayer = qt5.callPackage ../applications/video/smplayer { }; smplayer = qt5.callPackage ../applications/video/smplayer { };