diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/sip')
-rw-r--r-- | nixpkgs/pkgs/servers/sip/freeswitch/default.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/sip/freeswitch/modules.nix | 8 |
2 files changed, 17 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index 46ef6bcfac5e..f665e6d2a906 100644 --- a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -3,7 +3,7 @@ , openssl, perl, sqlite, libjpeg, speex, pcre , ldns, libedit, yasm, which, libsndfile, libtiff -, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib +, callPackage , SystemConfiguration @@ -13,9 +13,7 @@ let -availableModules = import ./modules.nix { - inherit curl lua libmysqlclient postgresql libopus libctb gsmlib; -}; +availableModules = callPackage ./modules.nix { }; # the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ @@ -101,6 +99,14 @@ stdenv.mkDerivation rec { patchShebangs libs/libvpx/build/make/rtcd.pl substituteInPlace libs/libvpx/build/make/configure.sh \ --replace AS=\''${AS} AS=yasm + + # Disable advertisement banners + for f in src/include/cc.h libs/esl/src/include/cc.h; do + { + echo 'const char *cc = "";' + echo 'const char *cc_s = "";' + } > $f + done ''; nativeBuildInputs = [ pkgconfig autoreconfHook ]; 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 = { |