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

freeswitch: Add support for mod_opusfile 

Also switch to callPackage, add the webm module (untested), and
fix the av module.
This commit is contained in:
Janne Heß 2020-06-05 20:01:13 +02:00
parent 7048a817b2
commit 86d311660a
No known key found for this signature in database
GPG Key ID: 69165158F05265DF
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/sip/freeswitch/default.nix
View File

@ -3,7 +3,7 @@
, openssl, perl, sqlite, libjpeg, speex, pcre , openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, libsndfile, libtiff , ldns, libedit, yasm, which, libsndfile, libtiff
, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib , callPackage
, SystemConfiguration , SystemConfiguration
@ -13,9 +13,7 @@
let let
availableModules = import ./modules.nix { availableModules = callPackage ./modules.nix { };
inherit curl lua libmysqlclient postgresql libopus libctb gsmlib;
};
# the default list from v1.8.7, except with applications/mod_signalwire also disabled # the default list from v1.8.7, except with applications/mod_signalwire also disabled
defaultModules = mods: with mods; [ defaultModules = mods: with mods; [

8
pkgs/servers/sip/freeswitch/modules.nix
View File

@ -1,8 +1,12 @@
{ libopus { libopus
, opusfile
, libopusenc
, libogg
, libctb , libctb
, gsmlib , gsmlib
, lua , lua
, curl , curl
, ffmpeg
, libmysqlclient , libmysqlclient
, postgresql , postgresql
}: }:
@ -17,7 +21,7 @@ in
{ {
applications = { applications = {
abstraction = mk "applications/mod_abstraction" []; abstraction = mk "applications/mod_abstraction" [];
av = mk "applications/mod_av" []; av = mk "applications/mod_av" [ ffmpeg ];
avmd = mk "applications/mod_avmd" []; avmd = mk "applications/mod_avmd" [];
bert = mk "applications/mod_bert" []; bert = mk "applications/mod_bert" [];
blacklist = mk "applications/mod_blacklist" []; blacklist = mk "applications/mod_blacklist" [];
@ -161,6 +165,7 @@ in
imagick = mk "formats/mod_imagick" []; imagick = mk "formats/mod_imagick" [];
local_stream = mk "formats/mod_local_stream" []; local_stream = mk "formats/mod_local_stream" [];
native_file = mk "formats/mod_native_file" []; native_file = mk "formats/mod_native_file" [];
opusfile = mk "formats/mod_opusfile" [ libopus opusfile libopusenc libogg ];
png = mk "formats/mod_png" []; png = mk "formats/mod_png" [];
portaudio_stream = mk "formats/mod_portaudio_stream" []; portaudio_stream = mk "formats/mod_portaudio_stream" [];
shell_stream = mk "formats/mod_shell_stream" []; shell_stream = mk "formats/mod_shell_stream" [];
@ -169,6 +174,7 @@ in
ssml = mk "formats/mod_ssml" []; ssml = mk "formats/mod_ssml" [];
tone_stream = mk "formats/mod_tone_stream" []; tone_stream = mk "formats/mod_tone_stream" [];
vlc = mk "formats/mod_vlc" []; vlc = mk "formats/mod_vlc" [];
webm = mk "formats/mod_webm" [];
}; };
languages = { languages = {