Merge pull request #2159 from lethalman/gst-no-faac

gst-plugins-bad: disable faac by default because it's unfree
This commit is contained in:
Mathijs Kwik 2014-04-09 06:47:16 +02:00
commit fccf059216

View File

@ -1,11 +1,14 @@
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
, faac, faad2, libass, libkate, libmms , faacSupport ? false, faac ? null
, faad2, libass, libkate, libmms
, libmodplug, mpeg2dec, mpg123 , libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg , openjpeg, libopus, librsvg
, timidity, libvdpau, wayland , timidity, libvdpau, wayland
, libwebp, xvidcore, gnutls , libwebp, xvidcore, gnutls
}: }:
assert faacSupport -> faac != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.2.3"; name = "gst-plugins-bad-1.2.3";
@ -32,10 +35,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gst-plugins-base orc gst-plugins-base orc
faac faad2 libass libkate libmms faad2 libass libkate libmms
libmodplug mpeg2dec mpg123 libmodplug mpeg2dec mpg123
openjpeg libopus librsvg openjpeg libopus librsvg
timidity libvdpau wayland timidity libvdpau wayland
libwebp xvidcore gnutls libwebp xvidcore gnutls
]; ] ++ stdenv.lib.optional faacSupport faac;
} }