mlt: 6.4.1 -> 6.6.0

fix opencv incompatibility reported in #36170

+9 -32
+2 -15
pkgs/development/libraries/mlt/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 name = "mlt-${version}"; 9 - version = "6.4.1"; 9 + version = "6.6.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "mltframework"; 13 13 repo = "mlt"; 14 14 rev = "v${version}"; 15 - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; 15 + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; 16 16 }; 17 - 18 - patches = [ 19 - # fix for glibc-2.26 20 - (fetchurl { 21 - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; 22 - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; 23 - }) 24 - # fix for glibc-2.26 25 - (fetchurl { 26 - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; 27 - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; 28 - }) 29 - ]; 30 17 31 18 buildInputs = [ 32 19 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
+7 -17
pkgs/development/libraries/mlt/qt-5.nix
··· 1 - { stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate 1 + { stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate 2 2 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg 3 3 , fftw, vid-stab, opencv3, ladspa-sdk 4 4 }: ··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 name = "mlt-${version}"; 10 - version = "6.4.1"; 10 + version = "6.6.0"; 11 11 12 - src = fetchurl { 13 - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; 14 - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; 12 + src = fetchFromGitHub { 13 + owner = "mltframework"; 14 + repo = "mlt"; 15 + rev = "v${version}"; 16 + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; 15 17 }; 16 - patches = [ 17 - # fix for glibc-2.26 18 - (fetchurl { 19 - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; 20 - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; 21 - }) 22 - # fix for glibc-2.26 23 - (fetchurl { 24 - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; 25 - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; 26 - }) 27 - ]; 28 18 29 19 buildInputs = [ 30 20 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2