summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorromildo <malaquias@gmail.com>2017-01-24 18:50:56 -0200
committerromildo <malaquias@gmail.com>2017-01-24 18:50:56 -0200
commite98aa7832caa9e68c5505d238027fcb04d1bdc76 (patch)
tree194631df39b853637bdbd11bbf92ea70057c7b67 /pkgs
parent1853f174d11040b3901e4c83d89f2578320a2e42 (diff)
downloadnixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar.gz
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar.bz2
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar.lz
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar.xz
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.tar.zst
nixpkgs-e98aa7832caa9e68c5505d238027fcb04d1bdc76.zip
mkvtoolnix: 9.6.0 -> 9.8.0
- Update mkvtoolnix to v9.8.0
- Add a build dependency on drake, because it is not bundled with
  mkvtoolnix anymore since v9.8.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 9c987534065..e8dc1227ef8 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")
   ];