From c84eb70b511edbeefba07a7539e8e2ce2c07285c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:48 +0000 Subject: [PATCH] Latest exosip and linphone svn path=/nixpkgs/trunk/; revision=32172 --- pkgs/applications/networking/linphone/default.nix | 10 ++++++---- pkgs/development/libraries/exosip/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix index 07ca19b63cc5..c98a8ae4fd90 100644 --- a/pkgs/applications/networking/linphone/default.nix +++ b/pkgs/applications/networking/linphone/default.nix @@ -2,16 +2,18 @@ readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }: stdenv.mkDerivation rec { - name = "linphone-3.4.3"; + name = "linphone-3.5.0"; src = fetchurl { - url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz"; - sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj"; + url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; + sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; }; - buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline + buildInputs = [ intltool gtk libglade libosip libexosip speex readline ffmpeg alsaLib SDL libv4l libtheora libXv ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 905b2648dbd3..d850618ecdf9 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/exosip/libeXosip2-3.5.0.tar.gz; - sha256 = "1z0s8qxxvyaksnnb9srfi3aipkkb7c1rsxdywl9xyxgnlri0w0a6"; + url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; }; name = "libexosip2-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ef62ad17494..88a27cad732c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7178,7 +7178,7 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/linphone { - inherit (gnome) libglade gtk; + inherit (gnome) libglade; }; lmms = callPackage ../applications/audio/lmms { };