Merge pull request #116768 from jluttine/update-linphone

This commit is contained in:
Sandro 2021-03-23 02:21:36 +01:00 committed by GitHub
commit 4846980e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 22 deletions

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bctoolbox"; pname = "bctoolbox";
version = "4.4.24"; version = "4.4.34";
nativeBuildInputs = [ cmake bcunit ]; nativeBuildInputs = [ cmake bcunit ];
buildInputs = [ mbedtls ]; buildInputs = [ mbedtls ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25";
}; };
# Do not build static libraries # Do not build static libraries

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "belcard"; pname = "belcard";
version = "4.4.24"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
}; };
buildInputs = [ bctoolbox belr ]; buildInputs = [ bctoolbox belr ];

View File

@ -2,15 +2,16 @@
, bctoolbox , bctoolbox
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, lib
, libantlr3c , libantlr3c
, mbedtls , mbedtls
, lib, stdenv , stdenv
, zlib , zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "belle-sip"; pname = "belle-sip";
version = "4.4.26"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z";
}; };
nativeBuildInputs = [ antlr3_4 cmake ]; nativeBuildInputs = [ antlr3_4 cmake ];

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "belr"; pname = "belr";
version = "4.3.2"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h";
}; };
buildInputs = [ bctoolbox ]; buildInputs = [ bctoolbox ];

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bzrtp"; pname = "bzrtp";
version = "4.4.9"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";

View File

@ -15,5 +15,12 @@ stdenv.mkDerivation {
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ vbgl ]; maintainers = with maintainers; [ vbgl ];
# The package failed to build with error:
# gcc: error: unrecognized command line option '-m64'
#
# See:
# https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d
# https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd
broken = stdenv.hostPlatform.isAarch64;
}; };
} }

View File

@ -49,7 +49,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liblinphone"; pname = "liblinphone";
version = "4.4.21"; version = "4.4.35";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8";
}; };
# Do not build static libraries # Do not build static libraries

View File

@ -2,14 +2,15 @@
, belle-sip , belle-sip
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, lib
, soci , soci
, sqlite , sqlite
, lib, stdenv , stdenv
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lime"; pname = "lime";
version = "4.4.21"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z";
}; };
buildInputs = [ bctoolbox soci belle-sip sqlite ]; buildInputs = [ bctoolbox soci belle-sip sqlite ];

View File

@ -33,7 +33,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mediastreamer2"; pname = "mediastreamer2";
version = "4.4.32"; version = "4.4.35";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g";
}; };
patches = [ patches = [

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ortp"; pname = "ortp";
version = "4.4.32"; version = "4.4.34";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m";
}; };
# Do not build static libraries # Do not build static libraries

View File

@ -6,17 +6,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "soci"; pname = "soci";
version = "4.0.0"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SOCI"; owner = "SOCI";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM=";
}; };
# Do not build static libraries # Do not build static libraries
cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];