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

mkvtoolnix: do not inline the result of optional in buildInputs because it returns a list and should be concatenated instead

This commit is contained in:
José Romildo Malaquias 2016-09-23 07:20:02 -03:00
parent cdec20ac58
commit d18a8f9cf2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/mkvtoolnix/default.nix
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";