diff options
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 73d462a6f4d2..ce6935a26064 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt , withGUI ? true @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg libvorbis flac - ] ++ optional withGUI qt5.qtbase; + ] + ++ optional stdenv.isDarwin libiconv + ++ optional withGUI qt5.qtbase; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.bunkus.org/videotools/mkvtoolnix/; license = licenses.gpl2; maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.linux + ++ optionals (!withGUI) platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35800184a5a..86058822f2a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8950,7 +8950,7 @@ with pkgs; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = mkvtoolnix.override { + mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; }; |