cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

belle-sip: unstable-2020-02-18 -> 4.4.13

Browse source
This commit is contained in:
Gabriel Ebner 2020-12-07 19:10:51 +01:00
parent c17a8f2717
commit 64f42418a6
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/belle-sip/default.nix
View file

@ -2,7 +2,6 @@
, bctoolbox , bctoolbox
, cmake , cmake
, fetchFromGitLab , fetchFromGitLab
, jre
, libantlr3c , libantlr3c
, mbedtls , mbedtls
, stdenv , stdenv
@ -11,20 +10,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "belle-sip"; pname = "belle-sip";
# Using master branch for linphone-desktop caused a chain reaction that many version = "4.4.13";
# of its dependencies needed to use master branch too.
version = "unstable-2020-02-18";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
owner = "public"; owner = "public";
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = "0dcb13416eae87edf140771b886aedaf6be8cf60"; rev = version;
sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv"; sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0";
}; };
nativeBuildInputs = [ jre cmake ]; nativeBuildInputs = [ cmake antlr3_4 ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
@ -37,10 +34,7 @@ stdenv.mkDerivation rec {
"-Wno-error=cast-function-type" "-Wno-error=cast-function-type"
]; ];
propagatedBuildInputs = [ antlr3_4 libantlr3c mbedtls bctoolbox ]; propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
# Fails to build with lots of parallel jobs
enableParallelBuilding = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://linphone.org/technical-corner/belle-sip"; homepage = "https://linphone.org/technical-corner/belle-sip";

5
pkgs/top-level/all-packages.nix
View file

@ -12388,10 +12388,7 @@ in
inherit (llvmPackages_6) llvm clang-unwrapped; inherit (llvmPackages_6) llvm clang-unwrapped;
}; };
belle-sip = callPackage ../development/libraries/belle-sip { belle-sip = callPackage ../development/libraries/belle-sip { };
stdenv = gcc8Stdenv;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
libbfd = callPackage ../development/libraries/libbfd { }; libbfd = callPackage ../development/libraries/libbfd { };