Slightly rewrite kde-package

svn path=/nixpkgs/trunk/; revision=23087

pkgs/desktops/kde-4.5/kde-package/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-{ pn, v, stable ? true, sha256, subdir ? null }: args:
+a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
 stdenv.mkDerivation ({
   name = "${pn}-${v}";
   src = fetchurl {
@@ -13,5 +13,5 @@ stdenv.mkDerivation ({
     platforms = stdenv.lib.platforms.linux;
     inherit stable;
     homepage = http://www.kde.org;
-  } // ( if args ? meta then args.meta else { } );
-} // args)
+  } // ( if a ? meta then a.meta else { } );
+} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))

pkgs/desktops/kde-4.5/libs/default.nix

@@ -9,7 +9,7 @@ kdePackage {
   pn = "kdelibs";
   v = "4.5.0";
   sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
-} {
+
   buildInputs = [
     cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
     shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr

pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix

@@ -4,7 +4,6 @@ kdePackage {
   pn = "oxygen-icons";
   v = "4.5.0";
   sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
-} {
   buildInputs = [ cmake ];
   meta = {
     description = "KDE Oxygen theme icons";

pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix

@@ -5,7 +5,7 @@ kdePackage {
   v = "0.96.1";
   subdir = "apps/KDE4.x/admin";
   sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
-} {
+
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
 }