From d18a8f9cf2fbba809a8c360fbe03aa59836b51c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 23 Sep 2016 07:20:02 -0300
Subject: [PATCH] mkvtoolnix: do not inline the result of optional in
buildInputs because it returns a list and should be concatenated instead
---
pkgs/applications/video/mkvtoolnix/default.nix | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 22072ca742c..0d02377b714 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -22,11 +22,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
buildInputs = [
- expat
- file xdg_utils boost libebml zlib
- libmatroska libogg libvorbis flac
- (optional withGUI qt5.qtbase)
- ];
+ expat file xdg_utils boost libebml zlib libmatroska libogg
+ libvorbis flac
+ ] ++ optional withGUI qt5.qtbase;
preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "./drake -j $NIX_BUILD_CORES";