From d9f08cf6f26337efd5a3a4142c38a0963aba31c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jul 2012 17:27:24 +0200 Subject: [PATCH] ffmpeg: Add alsaLib to dependencies. As @cillianderoiste pointed out, it makes sense to have this in, not only to record audio while grabbing the display. This is not optional in this case, as it isn't a compile time option either. And on the other hand, having ffmpeg running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to OSS if alsa isn't available anyway. --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 41768c4e313f..ee88fd0145cc 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 ] + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora