From b7a15bae9f9e67a265f2b2e8ed6c81a9e04eaddc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 31 Aug 2010 09:58:09 +0000
Subject: [PATCH] Adding libosip - GNU SIP library

svn path=/nixpkgs/trunk/; revision=23555
---
 pkgs/development/libraries/osip/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/osip/default.nix

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
new file mode 100644
index 000000000000..e63bbbb151df
--- /dev/null
+++ b/pkgs/development/libraries/osip/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "3.3.0";
+  src = fetchurl {
+    url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
+    sha256 = "08gqll8c7y9hzzs80cal7paxn6knnhbfkvzdaxs2sssrmbg2hpnl";
+  };
+  name = "libosip2-${version}";
+      
+  meta = {
+    license = "LGPLv2.1+";
+    description = "GNU oSIP library ";
+    maintainers = with stdenv.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with stdenv.lib.platforms;
+      linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0695c4270ed3..748a49e5d8fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3317,6 +3317,8 @@ let
 
   liboop = callPackage ../development/libraries/liboop { };
 
+  libosip = callPackage ../development/libraries/osip {};
+
   libotr = callPackage ../development/libraries/libotr { };
 
   libp11 = callPackage ../development/libraries/libp11 { };
@@ -6965,7 +6967,7 @@ let
 
   polytable = callPackage ../misc/tex/polytable { };
 
-  psi = callPackage ../applications/networking/instant-messengers/psi {
+  psi = makeOverridable (callPackage ../applications/networking/instant-messengers/psi) {
     qca2 = kde45.qca2;
     qca2_ossl = kde45.qca2_ossl;
     qt4 = qt47;