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

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

Browse Source 
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
parent 29c0d0047f 3010e63fb7
commit fccf059216
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/bad/default.nix
+6 -3
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;
} }