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

freeswitch: fix gsmopen build and enable by default for linux

Browse Source
This commit is contained in:
misuzu 2020-01-01 18:00:02 +02:00
parent 8cce0e0937
commit 96f4563f1e
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,19 @@
{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff
, libctb, gsmlib
, modules ? null
, postgresql
, enablePostgres ? true
, SystemConfiguration
}:
let let
availableModules = import ./modules.nix { inherit curl lua 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; [
applications.commands applications.commands
@ -57,26 +71,9 @@ defaultModules = mods: with mods; [
xml_int.cdr xml_int.cdr
xml_int.rpc xml_int.rpc
xml_int.scgi xml_int.scgi
]; ] ++ lib.optionals stdenv.isLinux [ endpoints.gsmopen ];
in enabledModules = (if modules != null then modules else defaultModules) availableModules;
{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff
, modules ? defaultModules
, postgresql
, enablePostgres ? true
, SystemConfiguration
}:
let
availableModules = import ./modules.nix { inherit curl lua libopus; };
enabledModules = modules availableModules;
modulesConf = let modulesConf = let
lst = builtins.map (mod: mod.path) enabledModules; lst = builtins.map (mod: mod.path) enabledModules;
@ -127,7 +124,7 @@ stdenv.mkDerivation rec {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
homepage = https://freeswitch.org/; homepage = https://freeswitch.org/;
license = stdenv.lib.licenses.mpl11; license = stdenv.lib.licenses.mpl11;
maintainers = with stdenv.lib.maintainers; [ ]; maintainers = with stdenv.lib.maintainers; [ misuzu ];
platforms = with stdenv.lib.platforms; unix; platforms = with stdenv.lib.platforms; unix;
}; };
} }

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

@ -1,4 +1,6 @@
{ libopus { libopus
, libctb
, gsmlib
, lua , lua
, curl , curl
}: }:
@ -114,7 +116,7 @@ in
endpoints = { endpoints = {
alsa = mk "endpoints/mod_alsa" []; alsa = mk "endpoints/mod_alsa" [];
dingaling = mk "endpoints/mod_dingaling" []; dingaling = mk "endpoints/mod_dingaling" [];
gsmopen = mk "endpoints/mod_gsmopen" []; gsmopen = mk "endpoints/mod_gsmopen" [ gsmlib libctb ];
h323 = mk "endpoints/mod_h323" []; h323 = mk "endpoints/mod_h323" [];
khomp = mk "endpoints/mod_khomp" []; khomp = mk "endpoints/mod_khomp" [];
loopback = mk "endpoints/mod_loopback" []; loopback = mk "endpoints/mod_loopback" [];