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

gst-plugins-bad: disable faac by default because it's unfree
NixOS · Apr 9, 2014 · fccf059 · fccf059
2 parents 29c0d00 + 3010e63
commit fccf059
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
-, faac, faad2, libass, libkate, libmms
+, faacSupport ? false, faac ? null
+, faad2, libass, libkate, libmms
 , libmodplug, mpeg2dec, mpg123 
 , openjpeg, libopus, librsvg
 , timidity, libvdpau, wayland
 , libwebp, xvidcore, gnutls
 }:
 
+assert faacSupport -> faac != null;
+
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.2.3";
 
@@ -32,10 +35,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc
-    faac faad2 libass libkate libmms
+    faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123 
     openjpeg libopus librsvg
     timidity libvdpau wayland
     libwebp xvidcore gnutls
-  ];
+  ] ++ stdenv.lib.optional faacSupport faac;
 }