From d96524476d3571c1bd15688a409c7ff836850db1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:45:37 +0000
Subject: [PATCH] Move libsoup to development/libraries

It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
---
 pkgs/desktops/gnome-2/default.nix             |  2 --
 pkgs/desktops/gnome-3/default.nix             |  2 --
 pkgs/desktops/gnome-3/platform/libsoup.nix    | 24 -------------------
 .../libraries}/libsoup/default.nix            |  0
 pkgs/top-level/all-packages.nix               |  9 +++++--
 5 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/platform/libsoup.nix
 rename pkgs/{desktops/gnome-2/desktop => development/libraries}/libsoup/default.nix (100%)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index ac99c24e308..c907a905849 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -73,8 +73,6 @@
 
   gnome_keyring = callPackage ./desktop/gnome-keyring { };
 
-  libsoup = callPackage ./desktop/libsoup { };
-
   libwnck = callPackage ./desktop/libwnck { };
 
   libgweather = callPackage ./desktop/libgweather { };
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index fc1d581b022..7cbf4cfa5fc 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -12,8 +12,6 @@
 
   libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
 
-  libsoup = callPackage ./platform/libsoup.nix { };
-
   GConf = callPackage ./platform/GConf.nix { };
 
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
diff --git a/pkgs/desktops/gnome-3/platform/libsoup.nix b/pkgs/desktops/gnome-3/platform/libsoup.nix
deleted file mode 100644
index fdf9e5bd9fe..00000000000
--- a/pkgs/desktops/gnome-3/platform/libsoup.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.36.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
-    sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
-  };
-
-
-  buildNativeInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  meta = {
-    inherit (glib.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2/desktop/libsoup/default.nix
rename to pkgs/development/libraries/libsoup/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6522c66c00f..ba0b02a0124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4171,6 +4171,8 @@ let
 
   libsndfile = callPackage ../development/libraries/libsndfile { };
 
+  libsoup = callPackage ../development/libraries/libsoup { };
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };
@@ -7877,10 +7879,13 @@ let
   #   import ../desktops/e17 { inherit callPackage pkgs; }
   # );
 
-  gnome2 = (callPackage ../desktops/gnome-2 {
+  gnome2 = callPackage ../desktops/gnome-2 {
     callPackage = pkgs.newScope pkgs.gnome2;
     self = pkgs.gnome2;
-  }  // pkgs.gtkLibs);
+  }  // pkgs.gtkLibs // {
+    # Backwards compatibility;
+    inherit (pkgs) libsoup;
+  };
 
   gnome3 = (import ../desktops/gnome-3 {
     callPackage = pkgs.newScope pkgs.gnome3;