git.iko.soy/typeable/nixpkgs
on master help sign in
freeswitch: 1.10.3 -> 1.10.5

now depends on spandsp and sofia_sip instead of carrying them in-tree

commit8385c2f9c69fdfbe7bc3d3a4ff6fa6c350f52e82 authorajs124 <git@ajs124.de> dateThu 3 Sep 2020, 03:48 (6 years ago) parente184ced
2 files changed+17−6
pkgs/servers/sip/freeswitch/default.nix+13−4 pkgs/servers/sip/freeswitch/modules.nix+4−2
pkgs/servers/sip/freeswitch/default.nix+13−4
@@ -1,6 +1,6 @@
1−{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook
1+{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
22, ncurses, gnutls, readline
3−, openssl, perl, sqlite, libjpeg, speex, pcre
3+, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
44, ldns, libedit, yasm, which, libsndfile, libtiff
55
66, callPackage
@@ -88,13 +88,21 @@ in
8888
8989stdenv.mkDerivation rec {
9090 pname = "freeswitch";
91− version = "1.10.3";
91+ version = "1.10.5";
9292 src = fetchFromGitHub {
9393 owner = "signalwire";
9494 repo = pname;
9595 rev = "v${version}";
96− sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai";
96+ sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha";
9797 };
98+
99+ patches = [
100+ # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5
101+ (fetchpatch {
102+ url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch";
103+ sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3";
104+ })
105+ ];
98106 postPatch = ''
99107 patchShebangs libs/libvpx/build/make/rtcd.pl
100108 substituteInPlace libs/libvpx/build/make/configure.sh \
@@ -114,6 +122,7 @@ stdenv.mkDerivation rec {
114122 openssl ncurses gnutls readline perl libjpeg
115123 sqlite pcre speex ldns libedit yasm which
116124 libsndfile libtiff
125+ libuuid
117126 ]
118127 ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
119128 ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
pkgs/servers/sip/freeswitch/modules.nix+4−2
@@ -9,6 +9,8 @@
99, ffmpeg
1010, libmysqlclient
1111, postgresql
12+, spandsp
13+, sofia_sip
1214}:
1315
1416let
@@ -68,7 +70,7 @@ in
6870 snom = mk "applications/mod_snom" [];
6971 sonar = mk "applications/mod_sonar" [];
7072 soundtouch = mk "applications/mod_soundtouch" [];
71− spandsp = mk "applications/mod_spandsp" [];
73+ spandsp = mk "applications/mod_spandsp" [ spandsp ];
7274 spy = mk "applications/mod_spy" [];
7375 stress = mk "applications/mod_stress" [];
7476 translate = mk "applications/mod_translate" [];
@@ -136,7 +138,7 @@ in
136138 rtc = mk "endpoints/mod_rtc" [];
137139 rtmp = mk "endpoints/mod_rtmp" [];
138140 skinny = mk "endpoints/mod_skinny" [];
139− sofia = mk "endpoints/mod_sofia" [];
141+ sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
140142 verto = mk "endpoints/mod_verto" [];
141143 };
142144