From ecad1023264ca5079cad04ef360ac770de1d1440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 12:29:03 +0100 Subject: [PATCH] pkgs/development/libraries/ffmpeg/generic.nix: don't insert faac into buildInputs unconditionally This is a hot-fix to mitigate https://github.com/NixOS/nixpkgs/issues/6727. --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index fda9f8080a9..35a847d9769 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -449,14 +449,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - alsaLib bzip2 celt faac faad2 fdk_aac fontconfig freetype frei0r fribidi + alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ]; + ] ++ optional faacExtlib faac; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart'';