Merge pull request #142985 from NixOS/backport-122445-to-release-21.05

[Backport release-21.05] freeswitch: 1.10.5 > 1.10.6
This commit is contained in:
Timothy DeHerrera 2021-10-26 09:31:26 -06:00 committed by GitHub
commit e5eb3a7a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook
{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook
, ncurses, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
, ldns, libedit, yasm, which, libsndfile, libtiff
@ -88,21 +88,14 @@ in
stdenv.mkDerivation rec {
pname = "freeswitch";
version = "1.10.5";
version = "1.10.6";
src = fetchFromGitHub {
owner = "signalwire";
repo = pname;
rev = "v${version}";
sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha";
sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2";
};
patches = [
# https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5
(fetchpatch {
url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch";
sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3";
})
];
postPatch = ''
patchShebangs libs/libvpx/build/make/rtcd.pl
substituteInPlace libs/libvpx/build/make/configure.sh \
@ -117,10 +110,11 @@ stdenv.mkDerivation rec {
done
'';
nativeBuildInputs = [ pkg-config autoreconfHook ];
strictDeps = true;
nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ];
buildInputs = [
openssl ncurses gnutls readline perl libjpeg
sqlite pcre speex ldns libedit yasm which
openssl ncurses gnutls readline libjpeg
sqlite pcre speex ldns libedit
libsndfile libtiff
libuuid
]