Author: urkud Date: Fri Aug 13 14:06:36 2010 New Revision: 23163 URL: https://svn.nixos.org/websvn/nix/?rev=23163&sc=1
Log: Add kdeartwork-4.5.0 Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake Fri Aug 13 14:06:36 2010 (r23163) @@ -0,0 +1,85 @@ +#Macro to find xscreensaver directory + +# Copyright (c) 2006, Laurent Montel, <[email protected]> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NOT XSCREENSAVER_FOUND) + FIND_PATH(XSCREENSAVER_DIR deco + HINTS + ${KDE4_INCLUDE_DIR} + PATHS + /usr + /usr/local + /opt/local + /usr/X11R6 + /opt/kde + /opt/kde3 + /usr/kde + /usr/local/kde + /usr/local/xscreensaver + /usr/openwin/lib/xscreensaver + /etc + PATH_SUFFIXES + lib${LIB_SUFFIX}/xscreensaver + lib/xscreensaver + lib${LIB_SUFFIX}/misc/xscreensaver + lib/misc/xscreensaver + libexec/xscreensaver + bin/xscreensaver-hacks + hacks) + message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}) + + set(XSCREENSAVER_CONFIG_DIR) + FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml + PATHS + ${KDE4_INCLUDE_DIR} + /usr/ + /usr/local/ + /opt/local/ + /usr/X11R6/ + /opt/kde/ + /opt/kde3/ + /usr/kde/ + /usr/local/kde/ + /usr/openwin/lib/xscreensaver/ + /etc/ + PATH_SUFFIXES xscreensaver share/xscreensaver + ) + #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}>") +#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") + +# Need to fix hack +if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + set(XSCREENSAVER_FOUND TRUE) +endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + +if (XSCREENSAVER_FOUND) + if (NOT Xscreensaver_FIND_QUIETLY) + message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") + endif (NOT Xscreensaver_FIND_QUIETLY) +else (XSCREENSAVER_FOUND) + if (Xscreensaver_FIND_REQUIRED) + message(FATAL_ERROR "XScreenSaver not found") + endif (Xscreensaver_FIND_REQUIRED) +endif (XSCREENSAVER_FOUND) + + +MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix Fri Aug 13 14:06:29 2010 (r23162) +++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix Fri Aug 13 14:06:36 2010 (r23163) @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver -, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: +{ kdePackage, cmake, qt4, perl, xscreensaver +, kdelibs, kdebase_workspace, automoc4, strigi, eigen}: + +kdePackage { + pn = "kdeartwork"; + v = "4.5.0"; + + buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 + strigi eigen ]; + + preConfigure = '' + cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake + ''; -stdenv.mkDerivation { - name = "kdeartwork-4.4.92"; - src = fetchurl { - url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2"; - sha256 = "17c481za2jfrmhd946jbhgwpcyzjkgjkk2jw84wbj8v694ry3xym"; - }; - buildInputs = [ cmake qt4 perl xscreensaver - kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; meta = { description = "KDE artwork"; longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers"; license = "LGPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; }; } Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Fri Aug 13 14:06:29 2010 (r23162) +++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Fri Aug 13 14:06:36 2010 (r23163) @@ -40,6 +40,8 @@ kdebase_workspace = callPackage ./base-workspace { }; + kdeartwork = callPackage ./artwork { }; + ### DEVELOPMENT kdebindings = callPackage ./bindings { }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
