Merge pull request #55871 from tadeokondrak/update-mkvtoolnix

mkvtoolnix: 28.2.0 -> 31.0.0
This commit is contained in:
Vladyslav M 2019-02-16 14:41:20 +02:00 committed by GitHub
commit 5601ba77c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib
, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark
, withGUI ? true , withGUI ? true
, qtbase ? null , qtbase ? null
, qtmultimedia ? null , qtmultimedia ? null
@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}"; name = "mkvtoolnix-${version}";
version = "28.2.0"; version = "31.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mbunkus"; owner = "mbunkus";
repo = "mkvtoolnix"; repo = "mkvtoolnix";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa"; sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
expat file xdg_utils boost libebml zlib expat file xdg_utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark libmatroska libogg libvorbis flac cmark
] ++ optional stdenv.isDarwin libiconv ] ++ optional stdenv.isDarwin libiconv
++ optionals withGUI [ qtbase qtmultimedia ]; ++ optionals withGUI [ qtbase qtmultimedia ];