From dd37d34e5f20355dc7178f32ecb15ab2f11c7f9b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 05:19:44 +0000
Subject: [PATCH] kdeadmin-4.5.1, kdeplasma-addons-4.5.1. Have no time to split

svn path=/nixpkgs/trunk/; revision=23805
---
 pkgs/desktops/kde-4.5/admin/default.nix         | 4 +++-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix  | 8 ++++++++
 pkgs/desktops/kde-4.5/plasma-addons/default.nix | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix
index cd360e4dab1..e758c3e2eae 100644
--- a/pkgs/desktops/kde-4.5/admin/default.nix
+++ b/pkgs/desktops/kde-4.5/admin/default.nix
@@ -8,6 +8,8 @@ kde.package {
 
   inherit system_config_printer;
 
+  # TODO: split, check which packages work on nixos
+
   PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
 
   buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
@@ -18,7 +20,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdeadmin";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index be95d24cf2d..edb8c8b77ee 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -164,4 +164,12 @@ builtins.listToAttrs
   name = "kdegames-4.5.1.tar.bz2";
   value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
 }
+{
+  name = "kdeplasma-addons-4.5.1.tar.bz2";
+  value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5";
+}
+{
+  name = "kdeadmin-4.5.1.tar.bz2";
+  value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
index 494fd0aa764..cb3dbdf2cc7 100644
--- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
@@ -5,6 +5,9 @@
 
 kde.package {
 
+  preConfigure =
+    "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake";
+
   buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
     attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
     libqalculate soprano libXtst kdeedu ];
@@ -14,7 +17,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdeplasma-addons";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }