diff options
| author | Robin Gloster <mail@glob.in> | 2017-09-27 00:50:42 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-09-27 00:51:20 +0200 |
| commit | 1a681a6ecb51c4dc80ab9a6065870323ba3aa549 (patch) | |
| tree | f2ca81a9cf49b9e80878a687891561e5ad4da02f /pkgs/applications/video | |
| parent | 9824ca6975fcbf5a2da9e6ba98dacafaa12bb1b3 (diff) | |
| download | nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar.gz nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar.bz2 nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar.lz nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar.xz nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.tar.zst nixlib-1a681a6ecb51c4dc80ab9a6065870323ba3aa549.zip | |
shotcut: 17.02 -> 17.09
fixes the previously broken build
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 72dbf87fdefe..88cb43b4d91f 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -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; { |