diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-18 18:56:48 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-18 18:56:48 +0000 |
commit | 6ba9dcb54c12d9c9377a387eeced3bfc1575f93a (patch) | |
tree | 6b1f3c70ef00c196ec5e7e0eaeadf1b054477c4e | |
parent | e9fd810997aadfcc857a19b792c26a2c82cb6ac2 (diff) |
Add kdesdk-4.5.0
svn path=/nixpkgs/trunk/; revision=23236
-rw-r--r-- | pkgs/desktops/kde-4.5/default.nix | 1 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.5/sdk/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.5/sdk/find-svn.patch | 59 |
3 files changed, 81 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index d984c4fe61bd0..8eeea097558b1 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -51,6 +51,7 @@ kdemultimedia = callPackage ./multimedia { }; kdenetwork = callPackage ./network { }; kdeplasma_addons = callPackage ./plasma-addons { }; + kdesdk = callPackage ./sdk { }; kdetoys = callPackage ./toys { }; kdeutils = callPackage ./utils { }; ### DEVELOPMENT diff --git a/pkgs/desktops/kde-4.5/sdk/default.nix b/pkgs/desktops/kde-4.5/sdk/default.nix new file mode 100644 index 0000000000000..b03a1d88595dd --- /dev/null +++ b/pkgs/desktops/kde-4.5/sdk/default.nix @@ -0,0 +1,21 @@ +{ kdePackage, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, + aprutil , shared_mime_info, hunspell , kdelibs, kdepimlibs, automoc4, + kdebindings, strigi, kdebase, libtool, antlr}: + +kdePackage { + pn = "kdesdk"; + v = "4.5.0"; + + buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion aprutil apr + shared_mime_info kdelibs kdepimlibs automoc4 strigi hunspell kdebindings + kdebase libtool binutils antlr ]; + + patches = [ ./find-svn.patch ]; + +#cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON -DBUILD_kioslave=ON"; + meta = { + description = "KDE SDK"; + longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.5/sdk/find-svn.patch b/pkgs/desktops/kde-4.5/sdk/find-svn.patch new file mode 100644 index 0000000000000..61cb49b308f2c --- /dev/null +++ b/pkgs/desktops/kde-4.5/sdk/find-svn.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake +index 59bcb96..2eac05d 100644 +--- a/cmake/modules/FindSVN.cmake ++++ b/cmake/modules/FindSVN.cmake +@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS + FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS + /usr/local/apr/bin + ) ++find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS ++ /usr/local/apr/bin ++) + + if(SVNCONFIG_EXECUTABLE) + +@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) + else(APRCONFIG_EXECUTABLE) + FIND_PATH(_INCLUDES apr_pools.h +- ${SVN_INCLUDES}/apr-0/ +- ${SVN_INCLUDES}/apr-1/ +- ${SVN_INCLUDES}/apr-1.0/ +- /usr/include/apr-0/ +- /usr/include/apr-1/ +- /usr/include/apr-1.0/ +- /usr/local/include/apr-0/ +- /usr/local/include/apr-1/ +- /usr/local/include/apr-1.0/ ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) +@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_FOUND FALSE) # no apr == can't compile! + endif(_INCLUDES) + endif(APRCONFIG_EXECUTABLE) ++ ++ # Use apu-config if it exists ++ if(APUCONFIG_EXECUTABLE) ++ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) ++ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) ++ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(APUCONFIG_EXECUTABLE) ++ FIND_PATH(_INCLUDES apu.h ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 ++ ) ++ if(_INCLUDES) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(_INCLUDES) ++ set(SVN_FOUND FALSE) # no apr == can't compile! ++ endif(_INCLUDES) ++ endif(APUCONFIG_EXECUTABLE) + FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) + if(SVN_LIBRARIES) + FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) |