diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-07-10 04:56:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-10 04:56:59 +0300 |
commit | 19146cefa10f485924c01db2e5f8d19b6243ece1 (patch) | |
tree | a715a6e8e72653c20f782f1a9c50169fb41e34f1 | |
parent | 931706cdc129dc27a2948114de9f8aaa2c12d33f (diff) | |
parent | 726059d4e821197ed550e5b8a067e2e1b9cd4e2d (diff) | |
download | nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar.gz nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar.bz2 nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar.lz nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar.xz nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.tar.zst nixpkgs-19146cefa10f485924c01db2e5f8d19b6243ece1.zip |
Merge pull request #16815 from romildo/upd.mkvtoolnix
mkvtoolnix: 8.9.0 -> 9.2.0
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 4eeb733d978..69e52065419 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake , ruby, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac , withGUI ? true @@ -10,18 +10,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "8.9.0"; + version = "9.2.0"; - src = fetchgit { - url = "https://github.com/mbunkus/mkvtoolnix.git"; - rev = "54e6b52b3dde07f89da4542997ef059e18802128"; - sha256 = "1gipydk1xisqy110rr38dgjzpxl8zxbm12kf7b2f4xh4iw17j0k2"; + src = fetchFromGitHub { + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "02w3161iqaijs3bz5w2wily9nz55xnhq1bdm2s5qi8v3sbcqd6df"; }; - nativeBuildInputs = [ gettext ruby ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; buildInputs = [ - pkgconfig autoconf automake expat + expat file xdg_utils boost libebml zlib libmatroska libogg libvorbis flac (optional withGUI qt5.qtbase) |