Fix kde-4.5 kscreensaver
svn path=/nixpkgs/trunk/; revision=23768
This commit is contained in:
parent
82d07ebaa2
commit
ddce0423d9
@ -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)
|
||||
|
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user