diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/servers/sip/freeswitch/modules.nix | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/servers/sip/freeswitch/modules.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/sip/freeswitch/modules.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix b/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix index be80fe56dda6..794b45cd227e 100644 --- a/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix +++ b/nixpkgs/pkgs/servers/sip/freeswitch/modules.nix @@ -1,8 +1,12 @@ { libopus +, opusfile +, libopusenc +, libogg , libctb , gsmlib , lua , curl +, ffmpeg , libmysqlclient , postgresql }: @@ -17,7 +21,7 @@ in { applications = { abstraction = mk "applications/mod_abstraction" []; - av = mk "applications/mod_av" []; + av = mk "applications/mod_av" [ ffmpeg ]; avmd = mk "applications/mod_avmd" []; bert = mk "applications/mod_bert" []; blacklist = mk "applications/mod_blacklist" []; @@ -161,6 +165,7 @@ in imagick = mk "formats/mod_imagick" []; local_stream = mk "formats/mod_local_stream" []; native_file = mk "formats/mod_native_file" []; + opusfile = mk "formats/mod_opusfile" [ libopus opusfile libopusenc libogg ]; png = mk "formats/mod_png" []; portaudio_stream = mk "formats/mod_portaudio_stream" []; shell_stream = mk "formats/mod_shell_stream" []; @@ -169,6 +174,7 @@ in ssml = mk "formats/mod_ssml" []; tone_stream = mk "formats/mod_tone_stream" []; vlc = mk "formats/mod_vlc" []; + webm = mk "formats/mod_webm" []; }; languages = { |