Adding linphone

svn path=/nixpkgs/trunk/; revision=25545

4 files changed, 45 insertions, 2 deletions

diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix
new file mode 100644
index 00000000000..7ed64de9ee6
--- /dev/null
+++ b/pkgs/applications/networking/linphone/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex,
+  readline, ffmpeg, alsaLib, SDL, libv4l, libtheora }:
+        
+stdenv.mkDerivation {
+  name = "linphone-3.3.2";
+
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/linphone/3.3.x/sources/linphone-3.3.2.tar.gz;
+    sha256 = "0plxqs6v2jz6s7ig8wfzg2ivjvdjja5xhqvrcsv644zl3b4igax7";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline
+    ffmpeg alsaLib SDL libv4l libtheora ];
+
+  meta = {
+    homepage = http://www.linphone.org/;
+    description = "Open Source video SIP softphone";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
new file mode 100644
index 00000000000..905b2648dbd
--- /dev/null
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libosip, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "3.5.0";
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/exosip/libeXosip2-3.5.0.tar.gz;
+    sha256 = "1z0s8qxxvyaksnnb9srfi3aipkkb7c1rsxdywl9xyxgnlri0w0a6";
+  };
+  name = "libexosip2-${version}";
+
+  buildInputs = [ libosip openssl pkgconfig ];
+      
+  meta = {
+    license = "GPLv2+";
+    description = "Library that hides the complexity of using the SIP protocol";
+  };
+}
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index e63bbbb151d..c2cb2e0fc5f 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "3.3.0";
+  version = "3.5.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "08gqll8c7y9hzzs80cal7paxn6knnhbfkvzdaxs2sssrmbg2hpnl";
+    sha256 = "14csf6z7b802bahxd560ibx3mg2fq3ki734vf3k2vknr4jm5v5fx";
   };
   name = "libosip2-${version}";
       
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96c1b09ca02..75f182e3eee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3441,6 +3441,8 @@ let
 
   libexif = callPackage ../development/libraries/libexif { };
 
+  libexosip = callPackage ../development/libraries/exosip {};
+
   libextractor = callPackage ../development/libraries/libextractor {
     inherit (gnome) gtk;
     libmpeg2 = mpeg2dec;
@@ -6223,6 +6225,10 @@ let
 
   links2Stdenv = callPackage ../applications/networking/browsers/links2/stdenv.nix { };
 
+  linphone = callPackage ../applications/networking/linphone {
+    inherit (gnome) libglade gtk;
+  };
+
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };