From 53c400355947f4b93c201e30473a652250544e2c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 00:52:21 +0200 Subject: [PATCH 1/2] linphone: 3.8.5 -> 3.9.1 3.10.2 is available from github but there is no autoconfigured tarball and they added a dependency that's not packaged for nix (bctoolbox) --- .../networking/instant-messengers/linphone/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 781d10cbc4f..2df428a1eb4 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -5,11 +5,13 @@ }: stdenv.mkDerivation rec { - name = "linphone-3.8.5"; + name = "linphone-${version}"; + major = "3.9"; + version = "${major}.1"; src = fetchurl { - url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; - sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax"; + url = "mirror://savannah/linphone/${major}.x/sources/${name}.tar.gz"; + sha256 = "1b14gwq36d0sbn1125if9zydll9kliigk19zchbqiy9n2gjymrl4"; }; buildInputs = [ From 273898f4ba945216a803c7188265a76c67be3b73 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 00:53:33 +0200 Subject: [PATCH 2/2] linphone: remove lime support linphone stil uses polarssl, which was replaced by mbedTLS and is no more available on NixOS. Until this is fixed upstream we disable LIME (IM encryption). --- .../networking/instant-messengers/linphone/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 2df428a1eb4..e46151f1c0e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp -, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev +, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip , mediastreamer-openh264, makeWrapper }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 - polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip ]; nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ldap" "--with-ffmpeg=${ffmpeg.dev}" - "--with-polarssl=${polarssl}" - "--enable-lime" "--enable-external-ortp" "--enable-external-mediastreamer" ];