diff options
| author | Robin Gloster <mail@glob.in> | 2017-09-27 00:50:42 +0200 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-16 21:37:19 +0000 |
| commit | 9396fdb3fa8d90b7d453b8b5ba95f6482f9980cf (patch) | |
| tree | e83573a82df51680042c27da50acc62f212d5750 /pkgs/applications/video | |
| parent | 1f4e8a31bb466e071aa6fa8df42ef0f5484f0b62 (diff) | |
shotcut: 17.02 -> 17.11
fixes the previously broken build cherry picked from commits: 1a681a6ecb51c4dc80ab9a6065870323ba3aa549 440ce4cfa1aaa18f784cf37d2f101875c72ff42e
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 9e98778cb45aa..6b1389c97ab00 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,25 +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.11"; - 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 = "1bw2cjpzycddxi9b21haiaslv0ikia85wwgkfm2xl2m15w5j8510"; }; 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 @@ -30,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; { @@ -48,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; - broken = true; }; } |