From 4a0d46438458c36c61651bdf31f178ea21236b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Mar 2014 21:55:52 +0100
Subject: [PATCH] glib_networking: big update, cleanup, meta added

---
 .../libraries/glib-networking/default.nix     | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 53d447cf5cae..618b37bae4c5 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,21 +1,33 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
-, gsettings_desktop_schemas, libgcrypt, libtasn1 }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy
+, gsettings_desktop_schemas }:
 
-stdenv.mkDerivation {
-  name = "glib-networking-2.30.2";
+let
+  ver_maj = "2.38";
+  ver_min = "2";
+in
+stdenv.mkDerivation rec {
+  name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
-    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
+    url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
+    sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
-  
+
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  propagatedBuildInputs =
-    [ glib libtool gnutls libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
+  propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ];
+
+  doCheck = false; # tests need to access the certificates (among other things)
+
+  meta = with stdenv.lib; {
+    description = "Network-related giomodules for glib";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+  };
 }
+