diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-02 23:25:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 23:25:27 +0000 |
| commit | 063669901a9a151207afb130062fa4538ee6f5a5 (patch) | |
| tree | 436d93f44520c8ecccc7fdf6cc4bdedef7a6c042 /pkgs | |
| parent | bf40da750f77ca9d404378e6f6731f77e1eb0c17 (diff) | |
| parent | e044db39748a0eee110481dee4ed8c2c5fe7686c (diff) | |
| download | nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar.gz nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar.bz2 nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar.lz nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar.xz nixlib-063669901a9a151207afb130062fa4538ee6f5a5.tar.zst nixlib-063669901a9a151207afb130062fa4538ee6f5a5.zip | |
Merge pull request #36211 from Mic92/mlt
mlt: 6.4.1 -> 6.6.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/mlt/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/mlt/qt-5.nix | 24 |
2 files changed, 9 insertions, 32 deletions
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 6eee8df5a23e..59700669ba7c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,28 +6,15 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; - buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7111a78381d1..27f7cf31cbf2 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , fftw, vid-stab, opencv3, ladspa-sdk }: @@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 |