diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-04-09 06:47:16 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-04-09 06:47:16 +0200 |
| commit | fccf05921629c2a70b674aa2cb986e8752709cfc (patch) | |
| tree | 395cabffb7e4256c9da4787ceafb631fa51107db | |
| parent | 29c0d0047faffed8055da6a7c84c0a36743f8ce0 (diff) | |
| parent | 3010e63fb780cffad90e224e80ffcaf8651a7dac (diff) | |
| download | nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar.gz nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar.bz2 nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar.lz nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar.xz nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.tar.zst nixpkgs-fccf05921629c2a70b674aa2cb986e8752709cfc.zip | |
Merge pull request #2159 from lethalman/gst-no-faac
gst-plugins-bad: disable faac by default because it's unfree
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7647c0f64db..eed4c12f254 100644 --- 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; } |