diff options
| author | koral <koral@mailoo.org> | 2015-01-10 14:46:05 +0100 |
|---|---|---|
| committer | koral <koral@mailoo.org> | 2015-01-10 14:46:05 +0100 |
| commit | 29d7fa652523369cd4b999532a625fc878f127f2 (patch) | |
| tree | 7a3c8b33fe7de4638d3b4dc92ea2238f8e07f914 /pkgs | |
| parent | 57090412cb66c771e5dafa2c8d94d36e492da01e (diff) | |
| download | nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar.gz nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar.bz2 nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar.lz nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar.xz nixlib-29d7fa652523369cd4b999532a625fc878f127f2.tar.zst nixlib-29d7fa652523369cd4b999532a625fc878f127f2.zip | |
Added mkvtoolnix-cli = mkvtoolnix without GUI dependencies.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 83e9589f165b..df0cb1b81106 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -6,6 +6,7 @@ , boost , xdg_utils , expat +, withGUI ? true , wxGTK , zlib , ruby @@ -14,6 +15,8 @@ , curl }: +assert withGUI -> wxGTK != null; + stdenv.mkDerivation rec { version = "7.5.0"; name = "mkvtoolnix-${version}"; @@ -25,8 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ 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"; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2e87913768a..120d04ce4904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6441,6 +6441,11 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix-cli = mkvtoolnix.override { + withGUI = false; + wxGTK = null; + }; + mlt-qt4 = callPackage ../development/libraries/mlt { qt = qt4; }; |