diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-31 19:44:58 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-31 19:44:58 +0000 |
| commit | 1b427fe052fa650c87a83c5c0e838f3ef92a52e2 (patch) | |
| tree | d3cc0d9ae350a8a4db8c06531076452384d5399e /pkgs/development/libraries/ffmpeg/default.nix | |
| parent | 483bedccda1ece4f4404c652ddc080f8aca79f50 (diff) | |
| parent | fc5ea05cfd4f76a4b32833bfe6f3b9fe68cfd93d (diff) | |
* Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot to update the hash. So secretly it was still building the old version. Also, now that we've realised that the PulseAudio server and library don't need to be the same build, disable some dependencies by default (avahi and bluez). svn path=/nixpkgs/branches/kde-4.7/; revision=28023
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/default.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5138bb1258120..70b97a3b92e91 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -15,6 +15,7 @@ assert vorbisSupport -> libvorbis != null; assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; +assert faacSupport -> faac != null; stdenv.mkDerivation rec { name = "ffmpeg-0.8"; |