Merge pull request #98112 from titouanco/mkvtoolnix

mkvtoolnix: 48.0.0 -> 50.0.0
This commit is contained in:
Michele Guerini Rocco 2020-09-17 09:28:17 +02:00 committed by GitHub
commit f61b2ea2df
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, drake { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake
, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2
, withGUI ? true , withGUI ? true
, qtbase ? null , qtbase ? null
, qtmultimedia ? null , qtmultimedia ? null
@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkvtoolnix"; pname = "mkvtoolnix";
version = "48.0.0"; version = "50.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mbunkus"; owner = "mbunkus";
repo = "mkvtoolnix"; repo = "mkvtoolnix";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat file xdg_utils boost libebml zlib fmt expat file xdg_utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark libmatroska libogg libvorbis flac cmark pcre2
] ++ optional stdenv.isDarwin libiconv ] ++ optional stdenv.isDarwin libiconv
++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];