From a466941945bc0e55f940853dca3a3343ccc9c559 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:46:12 +0000
Subject: [PATCH] Move last piece o gnome3 to top-level

Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
---
 .../documentation/gnome-user-docs/default.nix}              | 0
 pkgs/desktops/gnome-3/default.nix                           | 5 -----
 pkgs/top-level/all-packages.nix                             | 6 ++----
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/gnome-3/platform/gnome-user-docs.nix => data/documentation/gnome-user-docs/default.nix} (100%)
 delete mode 100644 pkgs/desktops/gnome-3/default.nix

diff --git a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
rename to pkgs/data/documentation/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
deleted file mode 100644
index fb503d1abb5f..000000000000
--- a/pkgs/desktops/gnome-3/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ callPackage }:
-
-{
-  gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fb90a32e4d..310b36039fa2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6135,6 +6135,8 @@ let
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
+
   gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {};
 
   hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
@@ -7890,10 +7892,6 @@ let
     inherit (pkgs) libsoup;
   };
 
-  gnome3 = (import ../desktops/gnome-3 {
-    callPackage = pkgs.newScope pkgs.gnome3;
-  });
-
   gnome = recurseIntoAttrs gnome2;
 
   kde3 = recurseIntoAttrs {