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

Revert "ffmpeg: Add optional Jack audio support."

Browse Source 
This reverts commit fe42f8add91b1616de94f878351f3dd5b44dbcdd.
This commit is contained in:
Eelco Dolstra 2012-07-24 11:43:24 -04:00
parent 471a9615a2
commit bf4c4d7a36
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
, jackSupport ? false, jackaudio ? null
, mp3Support ? true, lame ? null , mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
@ -13,7 +12,6 @@
, x11grabSupport ? false, libXext ? null, libXfixes ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null
}: }:
assert jackSupport -> jackaudio != null;
assert speexSupport -> speex != null; assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null; assert vorbisSupport -> libvorbis != null;
@ -56,7 +54,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
++ stdenv.lib.optional jackSupport jackaudio
++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional theoraSupport libtheora