public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5689 from k0ral/mkvtoolnix

Browse Source 
Added mkvtoolnix-cli = mkvtoolnix without GUI dependencies.
This commit is contained in:
Arseniy Seroka 2015-01-12 02:07:40 +03:00
commit cc17ebdca8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -6,6 +6,7 @@
, boost , boost
, xdg_utils , xdg_utils
, expat , expat
, withGUI ? true
, wxGTK , wxGTK
, zlib , zlib
, ruby , ruby
@ -14,6 +15,8 @@
, curl , curl
}: }:
assert withGUI -> wxGTK != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.5.0"; version = "7.5.0";
name = "mkvtoolnix-${version}"; name = "mkvtoolnix-${version}";
@ -25,8 +28,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libmatroska flac libvorbis file boost xdg_utils libmatroska flac libvorbis file boost xdg_utils
expat wxGTK zlib ruby gettext pkgconfig curl expat zlib ruby gettext pkgconfig curl
]; ] ++ stdenv.lib.optional withGUI wxGTK;
configureFlags = "--with-boost-libdir=${boost.lib}/lib"; configureFlags = "--with-boost-libdir=${boost.lib}/lib";
buildPhase = '' buildPhase = ''

5
pkgs/top-level/all-packages.nix
View File

@ -6529,6 +6529,11 @@ let
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = mkvtoolnix.override {
withGUI = false;
wxGTK = null;
};
mlt-qt4 = callPackage ../development/libraries/mlt { mlt-qt4 = callPackage ../development/libraries/mlt {
qt = qt4; qt = qt4;
}; };