Merge pull request #18871 from romildo/fix.mkvtoolnix

mkvtoolnix: qt5 development tools are not found
This commit is contained in:
Nikolay Amiantov 2016-09-24 13:31:05 +04:00 committed by GitHub
commit 0d7f5117fb

View File

@ -22,11 +22,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
buildInputs = [ buildInputs = [
expat expat file xdg_utils boost libebml zlib libmatroska libogg
file xdg_utils boost libebml zlib libvorbis flac
libmatroska libogg libvorbis flac ] ++ optional withGUI qt5.qtbase;
(optional withGUI qt5.qtbase)
];
preConfigure = "./autogen.sh; patchShebangs ."; preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "./drake -j $NIX_BUILD_CORES"; buildPhase = "./drake -j $NIX_BUILD_CORES";