From e0a4f988a4d72e91cc75f38e53ff8c105a169891 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 27 May 2011 05:39:44 +0000
Subject: [PATCH] Make Ekiga build

svn path=/nixpkgs/trunk/; revision=27305
---
 .../applications/networking/ekiga/default.nix |  2 +-
 pkgs/development/libraries/libgdata/0.6.nix   | 51 +++++++++++++++++++
 .../libraries/libgdata/default.nix            | 51 +++++++++++++++++++
 .../servers/evolution-data-server/default.nix |  8 +--
 pkgs/top-level/all-packages.nix               |  3 ++
 5 files changed, 110 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/libgdata/0.6.nix
 create mode 100644 pkgs/development/libraries/libgdata/default.nix

diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/ekiga/default.nix
index d411c3b0f57..276df1ae7a1 100644
--- a/pkgs/applications/networking/ekiga/default.nix
+++ b/pkgs/applications/networking/ekiga/default.nix
@@ -3,7 +3,7 @@ x@{builderDefsPackage
   , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
   , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
   , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
-  , libXrandr, randrproto, which, libxslt, libtasn1
+  , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/development/libraries/libgdata/0.6.nix b/pkgs/development/libraries/libgdata/0.6.nix
new file mode 100644
index 00000000000..4ce95505f8f
--- /dev/null
+++ b/pkgs/development/libraries/libgdata/0.6.nix
@@ -0,0 +1,51 @@
+x@{builderDefsPackage
+  , glib, libsoup, libxml2, pkgconfig, intltool, perl
+  , libtasn1, nettle, gmp
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="libgdata";
+    majorVersion="0.6";
+    minorVersion="6";
+    version="${majorVersion}.${minorVersion}";
+    name="${baseName}-${version}";
+    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
+    hash="cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "GData API library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.lgpl21Plus;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}/${sourceInfo.majorVersion}";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
new file mode 100644
index 00000000000..368d873e52a
--- /dev/null
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -0,0 +1,51 @@
+x@{builderDefsPackage
+  , glib, libsoup, libxml2, pkgconfig, intltool, perl
+  , libtasn1, nettle, gmp
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="libgdata";
+    majorVersion="0.8";
+    minorVersion="1";
+    version="${majorVersion}.${minorVersion}";
+    name="${baseName}-${version}";
+    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
+    hash="1ffhd1dvjflwjsiba1qdianlzfdlfkjgifmw3c7qs2g6fzkf62q8";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "GData API library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.lgpl21Plus;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}";
+    };
+  };
+}) x
+
diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix
index 84c1eee57e5..364bb55a5ee 100644
--- a/pkgs/servers/evolution-data-server/default.nix
+++ b/pkgs/servers/evolution-data-server/default.nix
@@ -3,7 +3,7 @@ x@{builderDefsPackage
   , db4, krb5, openldap, glib, libxml2, GConf
   , nss, gtk, libgnome, libsoup, gnome_keyring
   , gtkdoc, sqlite, libgweather, libical, icu
-  , dbus_glib, gperf, nspr
+  , dbus_glib, gperf, nspr, gmp, nettle, libgdata_0_6
   , ...}:
 builderDefsPackage
 (a :  
@@ -14,9 +14,9 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    url = "mirror://gnome/sources/evolution-data-server/2.30/evolution-data-server-2.30.3.tar.bz2";
-    hash = "147qkpiafrlq220qg2pmp9lbvh8bn339wh1699bgb7rvmdvycwrp";
-    version = "2.30.3";
+    url = "mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2";
+    hash = "744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c";
+    version = "2.32.3";
     name = "evolution-data-server-${version}";
   };
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71dac6dee1a..e5f789ab32b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3200,6 +3200,9 @@ let
 
   libgadu = callPackage ../development/libraries/libgadu { };
 
+  libgdata = (newScope gnome) ../development/libraries/libgdata {};
+  libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
+
   eglibc = callPackage ../development/libraries/eglibc {
     kernelHeaders = linuxHeaders;
     installLocales = getConfig [ "glibc" "locales" ] false;