diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-24 21:34:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 21:34:16 +0000 |
commit | 9977fb86a0a143200fc5fae2da4c12f7a1fe2223 (patch) | |
tree | 3e59ba2fba0f07740efd5c6dd6b3bc3c4886b450 /pkgs | |
parent | c915fd68cf3fad722ece7d9e9f5e3a48166efbb3 (diff) | |
parent | e98aa7832caa9e68c5505d238027fcb04d1bdc76 (diff) | |
download | nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar.gz nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar.bz2 nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar.lz nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar.xz nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.tar.zst nixlib-9977fb86a0a143200fc5fae2da4c12f7a1fe2223.zip |
Merge pull request #22111 from romildo/upd.mkvtoolnix
mkvtoolnix: 9.6.0 -> 9.8.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9c987534065e..e8dc1227ef87 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake -, ruby, file, xdg_utils, gettext, expat, qt5, boost +, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac , withGUI ? true }: @@ -10,16 +10,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.6.0"; + version = "9.8.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "14v6iclzkqxibzcdxr65bb5frmnsjyyly0d3lwv1gg7g1mkcw3jd"; + sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ] ++ optional withGUI qt5.qtbase; preConfigure = "./autogen.sh; patchShebangs ."; - buildPhase = "./drake -j $NIX_BUILD_CORES"; - installPhase = "./drake install -j $NIX_BUILD_CORES"; + buildPhase = "drake -j $NIX_BUILD_CORES"; + installPhase = "drake install -j $NIX_BUILD_CORES"; configureFlags = [ "--enable-magic" @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { "--disable-profiling" "--disable-precompiled-headers" "--disable-static-qt" - "--without-curl" "--with-gettext" (enableFeature withGUI "qt") ]; |