alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mkvtoolnix-cli: fix build on darwin

Browse source
This commit is contained in:
Vincent Laporte 2017-03-13 21:20:26 +00:00
parent 04290bbd14
commit 88d7718a64
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};
}

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

@ -8950,7 +8950,7 @@ with pkgs;
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = mkvtoolnix.override {
mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {
withGUI = false;
};