From 5c90976c6a3f24678d606c8680118a5f954a2e92 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 25 Aug 2011 20:00:55 +0000
Subject: [PATCH] Add meta to kde-4.7 'subdir' pkgs

svn path=/nixpkgs/trunk/; revision=28816
---
 pkgs/desktops/kde-4.7/kde-package/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
index cd1cd5be9b9..d06f8a8fd8b 100644
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.7/kde-package/default.nix
@@ -39,13 +39,14 @@ rec {
   kdeSubdirPkg = module:
     {name, subdir ? name, sane ? name}:
     let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, ...}:
+    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
     stdenv.mkDerivation ({
       name = "${name}-${release}";
       src = kdesrc module;
       cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
       "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
-    } // (removeAttrs a [ "cmakeFlags" ]));
+      meta = defMeta // meta;
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
 
   # A KDE monolithic module
   kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };