Author: urkud
Date: Mon Sep 13 17:34:19 2010
New Revision: 23768
URL: https://svn.nixos.org/websvn/nix/?rev=23768&sc=1
Log:
Fix kde-4.5 kscreensaver
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake Mon Sep
13 17:34:14 2010 (r23767)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake Mon Sep
13 17:34:19 2010 (r23768)
@@ -9,7 +9,7 @@
FIND_PATH(XSCREENSAVER_DIR deco
HINTS
${KDE4_INCLUDE_DIR}
- PATHS
+ PATHS
/usr
/usr/local
/opt/local
@@ -21,18 +21,18 @@
/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 @@
/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}>")
-
- if(XSCREENSAVER_CONFIG_DECO)
- set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
- #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
- endif(XSCREENSAVER_CONFIG_DECO)
-
+ MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
- # 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 @@
# 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)
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix Mon Sep
13 17:34:14 2010 (r23767)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix Mon Sep
13 17:34:19 2010 (r23768)
@@ -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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
