From 2e3480708ad230cbe2759cedc674c587b5a36354 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 6 Feb 2008 19:00:22 +0000
Subject: [PATCH] liboil, libosip2 and libeXosip2 added

svn path=/nixpkgs/branches/stdenv-updates/; revision=10517
---
 .../libraries/libeXosip2/3.0.3.nix            | 13 ++++++++++++
 pkgs/development/libraries/libeXosip2/result  |  1 +
 pkgs/development/libraries/liboil/0.3.12.nix  | 20 ++++++++++++++++++
 .../libraries/libosip2/3.0.3-2.nix            | 12 +++++++++++
 pkgs/top-level/all-packages.nix               | 21 +++++++++++++++++++
 5 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/libeXosip2/3.0.3.nix
 create mode 120000 pkgs/development/libraries/libeXosip2/result
 create mode 100644 pkgs/development/libraries/liboil/0.3.12.nix
 create mode 100644 pkgs/development/libraries/libosip2/3.0.3-2.nix

diff --git a/pkgs/development/libraries/libeXosip2/3.0.3.nix b/pkgs/development/libraries/libeXosip2/3.0.3.nix
new file mode 100644
index 000000000000..59eed17b417a
--- /dev/null
+++ b/pkgs/development/libraries/libeXosip2/3.0.3.nix
@@ -0,0 +1,13 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "libeXosip2-" + version;
+
+  src = fetchurl {
+    url = "http://downloa.savannah.nongnu.org/releases/exosip/${name}.tar.gz";
+    sha256 = "0jgy2mjq7r4kp8afl8zhymvca6hghp6chv36laiqz4bizcddzvxa";
+  };
+
+  propagatedBuildInputs = [libosip2];
+  configureFlags = "--enable-shared --disable-static";
+}
diff --git a/pkgs/development/libraries/libeXosip2/result b/pkgs/development/libraries/libeXosip2/result
new file mode 120000
index 000000000000..efa7575ab3a8
--- /dev/null
+++ b/pkgs/development/libraries/libeXosip2/result
@@ -0,0 +1 @@
+/nix/store/kc4kxnsi33x8a5p9xa3kv6w7dhj52w2f-libeXosip2-3.0.3
\ No newline at end of file
diff --git a/pkgs/development/libraries/liboil/0.3.12.nix b/pkgs/development/libraries/liboil/0.3.12.nix
new file mode 100644
index 000000000000..3e6537530614
--- /dev/null
+++ b/pkgs/development/libraries/liboil/0.3.12.nix
@@ -0,0 +1,20 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "liboil-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/liboil/${name}.tar.gz";
+    sha256 = "0gdmly9sli1918pnb4ds1g38ipxikn651hdss86mp4qlfb8wvqlv";
+  };
+
+  configureFlags = "--enable-shared --disable-static";
+
+  buildInputs = [pkgconfig];
+
+  meta = {
+    homepage = http://liboil.freedesktop.org;
+    description = "Liboil is a library of simple functions that are optimized
+    for various CPUs.";
+  };
+}
diff --git a/pkgs/development/libraries/libosip2/3.0.3-2.nix b/pkgs/development/libraries/libosip2/3.0.3-2.nix
new file mode 100644
index 000000000000..f8385807939f
--- /dev/null
+++ b/pkgs/development/libraries/libosip2/3.0.3-2.nix
@@ -0,0 +1,12 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "libosip2-" + version;
+
+  src = fetchurl {
+    url = "mirror://gnu/osip/${name}.tar.gz";
+    sha256 = "0jna6xwc42g1sh91hwzi71875mpazmnsaaq68hjirwldh39qlp69";
+  };
+
+  configureFlags = "--enable-shared --disable-static";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ce9ee7eca37..8b6dd327bdd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2189,6 +2189,13 @@ rec {
 
   libextractor = libextractorFun null;
 
+  libeXosip2Fun = lib.sumArgs
+    (selectVersion ../development/libraries/libeXosip2 "3.0.3") {
+    inherit fetchurl stdenv libosip2;
+  };
+
+  libeXosip2 = libeXosip2Fun null;
+
   libgcrypt = import ../development/libraries/libgcrypt {
     inherit fetchurl stdenv libgpgerror;
   };
@@ -2253,6 +2260,20 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  liboilFun = lib.sumArgs
+    (selectVersion ../development/libraries/liboil "0.3.12") {
+    inherit fetchurl stdenv pkgconfig;
+  };
+
+  liboil = liboilFun null;
+
+  libosip2Fun = lib.sumArgs
+    (selectVersion ../development/libraries/libosip2 "3.0.3-2") {
+    inherit fetchurl stdenv;
+  };
+
+  libosip2 = libosip2Fun null;
+
   libotr = import ../development/libraries/libotr {
     inherit fetchurl stdenv libgcrypt;
   };