From 519f4ea4b8b236eb272c9084f14be25b7e763623 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 15 Aug 2011 19:28:12 +0000
Subject: [PATCH] Add attribute that holds the resulting hierarchy

See comment in the committed code for details

svn path=/nixpkgs/trunk/; revision=28600
---
 pkgs/desktops/kde-4.7/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 4a24eaed2e70..a6f94c9e82e6 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,11 @@ let
         pkgs);
     in
       runCommand "${module}-${release}"
-      ({passthru = attrs // { propagatedUserEnvPackages = list; recurseForDerivations = true;};})
+      ({passthru = attrs // {
+       propagatedUserEnvPackages = list;
+       recurseForDerivations = true;
+       projects = attrs;
+       };})
         ''
           mkdir -pv $out/nix-support
           echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
@@ -117,9 +121,12 @@ kdepkgs // kdepkgs.kdebase //
 
   inherit release;
 
+# nix-instantiate /etc/nixos/nixpkgs -A kde47.moduleNames --strict to see
+# available packages
+  moduleNames = stdenv.lib.mapAttrs
+    (n: v: if v ? projects then builtins.attrNames v.projects else null) kdepkgs;
+
   full = stdenv.lib.attrValues kdepkgs;
 
   l10n = callPackage ./l10n { inherit release; };
-
-  subdirNames = map (x: x.module) (stdenv.lib.filter (x: !x.split && (x ? pkgs)) manifest.modules);
 }