From ddce0423d96261588d05121a0e61fd44b60de048 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 17:34:19 +0000
Subject: [PATCH] Fix kde-4.5 kscreensaver

svn path=/nixpkgs/trunk/; revision=23768
---
 .../kde-4.5/artwork/FindXscreensaver.cmake    | 38 +++++++------------
 .../desktops/kde-4.5/artwork/kscreensaver.nix |  3 +-
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
index caa5ddd92549..499ed75268e9 100644
--- a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
+++ b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
@@ -9,7 +9,7 @@ if (NOT XSCREENSAVER_FOUND)
   FIND_PATH(XSCREENSAVER_DIR deco
     HINTS
       ${KDE4_INCLUDE_DIR}
-	PATHS
+    PATHS
       /usr
       /usr/local
       /opt/local
@@ -21,18 +21,18 @@ if (NOT XSCREENSAVER_FOUND)
       /usr/local/xscreensaver
       /usr/openwin/lib/xscreensaver
       /etc
-	PATH_SUFFIXES
+    PATH_SUFFIXES
       lib${LIB_SUFFIX}/xscreensaver
+      lib${LIB_SUFFIX}/misc/xscreensaver
       lib/xscreensaver
-	  lib${LIB_SUFFIX}/misc/xscreensaver
-	  lib/misc/xscreensaver
-	  libexec/xscreensaver
-	  bin/xscreensaver-hacks
-	  hacks)
-  message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR})
+      lib64/xscreensaver
+      lib/misc/xscreensaver
+      libexec/xscreensaver
+      bin/xscreensaver-hacks
+      hacks)
+  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
 
-  set(XSCREENSAVER_CONFIG_DIR)
-  FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
+  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
     PATHS
     ${KDE4_INCLUDE_DIR}
     /usr/
@@ -45,22 +45,10 @@ if (NOT XSCREENSAVER_FOUND)
     /usr/local/kde/
     /usr/openwin/lib/xscreensaver/
     /etc/
-    PATH_SUFFIXES xscreensaver share/xscreensaver
+    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
   )
-  #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
 
-  if(XSCREENSAVER_CONFIG_DECO)
-	set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
-	#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif(XSCREENSAVER_CONFIG_DECO)
-
-
-  # Try and locate XScreenSaver config when path doesn't include config
-  if(NOT XSCREENSAVER_CONFIG_DIR)
-    FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-      /etc/xscreensaver
-      )
-  endif(NOT XSCREENSAVER_CONFIG_DIR)
 endif(NOT XSCREENSAVER_FOUND)
 
 #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
@@ -68,7 +56,7 @@ endif(NOT XSCREENSAVER_FOUND)
 
 # Need to fix hack
 if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-	set(XSCREENSAVER_FOUND TRUE)
+    set(XSCREENSAVER_FOUND TRUE)
 endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
 
 if (XSCREENSAVER_FOUND)
diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
index 9fb4b24b1078..f87527e71ab0 100644
--- a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
@@ -1,7 +1,8 @@
 { cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
 
 kde.package rec {
-  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace ];
+  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ];
+  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
   meta = {
     description = "KDE screen saver and savers";
     kde = {