mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 00:10:30 +00:00
Code Issues Wiki Activity

mkvtoolnix: 20.0.0. -> 21.0.0

Browse source
This commit is contained in:
rnhmjoj 2018-02-28 23:27:43 +01:00 committed by Robin Gloster
parent 565f22d27a
commit 6e21aa65d9
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/applications/video/mkvtoolnix/default.nix
View file

@ -1,32 +1,36 @@
{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost
, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark
, withGUI ? true , withGUI ? true
, qtbase ? null
, qtmultimedia ? null
}: }:
assert withGUI -> qt5 != null; assert withGUI -> qtbase != null && qtmultimedia != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}"; name = "mkvtoolnix-${version}";
version = "20.0.0"; version = "21.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mbunkus"; owner = "mbunkus";
repo = "mkvtoolnix"; repo = "mkvtoolnix";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r";
}; };
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; nativeBuildInputs = [
pkgconfig autoconf automake gettext
drake ruby docbook_xsl libxslt
];
buildInputs = [ buildInputs = [
expat file xdg_utils boost libebml zlib libmatroska libogg expat file xdg_utils boost libebml zlib
libvorbis flac cmark libmatroska libogg libvorbis flac cmark
] ] ++ optional stdenv.isDarwin libiconv
++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia ];
++ optionals withGUI [qt5.qtbase qt5.qtmultimedia];
preConfigure = "./autogen.sh; patchShebangs ."; preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "drake -j $NIX_BUILD_CORES"; buildPhase = "drake -j $NIX_BUILD_CORES";

2
pkgs/top-level/all-packages.nix
View file

@ -10464,7 +10464,7 @@ with pkgs;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {
withGUI = false; withGUI = false;