From 09060a0a19512a43be98aa5a0e1b58128181339e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 18:12:38 +0000
Subject: [PATCH] Add gnome3.{glib_networking,gsettings_desktop_schemas}

Cherry-pick from stdenv-updates

svn path=/nixpkgs/trunk/; revision=31356
---
 pkgs/desktops/gnome-3/default.nix             |  4 ++++
 .../gnome-3/platform/glib-networking.nix      | 22 +++++++++++++++++++
 .../platform/gsettings-desktop-schemas.nix    | 13 +++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/platform/glib-networking.nix
 create mode 100644 pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b82ca22d94f..30ce2f6abcc 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -4,5 +4,9 @@
   # Ensure that we use dbus-glib built with gtkLibs3x.glib
   dbus_glib = callPackage ../../development/libraries/dbus-glib { };
 
+  glib_networking = callPackage ./platform/glib-networking.nix {};
+
+  gsettings_desktop_schemas = callPackage ./platform/gsettings-desktop-schemas.nix {};
+
   GConf = callPackage ./platform/GConf.nix { };
 }
diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix
new file mode 100644
index 00000000000..ed28306d510
--- /dev/null
+++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt
+, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+  name = "glib-networking-2.30.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
+    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
+  };
+
+  propagatedBuildInputs = [ glib gnutls libgcrypt ];
+  buildInputs = [ gsettings_desktop_schemas ];
+  buildNativeInputs = [ xz pkgconfig intltool ];
+
+  configureFlags = "--without-ca-certificates";
+  postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";
+
+  meta = {
+    TODO = "Look at `--without-ca-certificates` again";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
new file mode 100644
index 00000000000..1d099d3dea3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gsettings-desktop-schemas-3.2.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz;
+    sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi";
+  };
+
+  buildInputs = [ glib ];
+  buildNativeInputs = [ pkgconfig xz intltool ];
+}