belle-sip: 1.4.2 -> 1.5.0

1 files changed, 17 insertions, 26 deletions

diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 4711a8baa36a9..b055b2358a540 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -1,35 +1,26 @@
-{ stdenv, fetchurl, libantlr3c, jre, polarssl }:
-
-let
-  # We must use antlr-3.4 with belle-sip-1.4.0
-  # We might be able to use antlr-3.5+ in the future
-  antlr = fetchurl {
-    url = "http://www.antlr3.org/download/antlr-3.4-complete.jar";
-    sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
-  };
-in
-stdenv.mkDerivation rec {
-  name = "belle-sip-1.4.2";
+{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
+  , cmake, zlib, bctoolbox
+}:
 
-  src = fetchurl {
-    url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
-    sha256 = "0c48jh3kjz58swvx1m63ijx5x0c0hf37d803d99flk2l10kbfb42";
+stdenv.mkDerivation rec {
+  baseName = "belle-sip";
+  version = "1.5.0";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn";
   };
 
-  nativeBuildInputs = [ jre ];
+  nativeBuildInputs = [ jre cmake ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-
-  # belle-sip.pc doesn't have a library path for antlr3c or polarssl
-  propagatedBuildInputs = [ libantlr3c polarssl ];
+  buildInputs = [ zlib ];
 
-  postPatch = ''
-    mkdir -p $TMPDIR/share/java
-    cp ${antlr} $TMPDIR/share/java/antlr.jar
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
-    sed -i "s,\(antlr_java_prefixes=\).*,\1\"$TMPDIR/share/java\"," configure
-    cat configure | grep antlr_java
-  '';
+  propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ];
 
   configureFlags = [
     "--with-polarssl=${polarssl}"