diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
| commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
| tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | |
| parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
| parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
| download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip | |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 3464b7aaeaa2..5b786b255019 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv -, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark +{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake +, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib +, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true , qtbase ? null , qtmultimedia ? null @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "28.2.0"; + version = "31.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa"; + sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - expat file xdg_utils boost libebml zlib + expat file xdg_utils boost libebml zlib fmt libmatroska libogg libvorbis flac cmark ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia ]; |