From 46c2adbc73215fc9bed00c78c3c7522dd517d9e0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 10 Aug 2010 09:42:57 +0000 Subject: [PATCH] Slightly rewrite kde-package svn path=/nixpkgs/trunk/; revision=23087 --- pkgs/desktops/kde-4.5/kde-package/default.nix | 6 +++--- pkgs/desktops/kde-4.5/libs/default.nix | 2 +- pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix | 1 - pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix index d1b58b280c6..6f41ed7daa6 100644 --- a/pkgs/desktops/kde-4.5/kde-package/default.nix +++ b/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" ])) diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index cdb2c8cc253..71daed339cd 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/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 diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix index 2c98f37e8d2..4cfc6aa5643 100644 --- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix +++ b/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"; diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix index dfdb83293a2..03543a6d7e2 100644 --- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix +++ b/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 ]; }