mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

Add kdesdk-4.5.0

Browse source 
svn path=/nixpkgs/trunk/; revision=23236
This commit is contained in:
Yury G. Kudryashov 2010-08-18 18:56:48 +00:00
parent e9fd810997
commit 6ba9dcb54c
3 changed files with 81 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/desktops/kde-4.5/default.nix
View file

@ -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

21
pkgs/desktops/kde-4.5/sdk/default.nix Normal file
View file

@ -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";
};
}

59
pkgs/desktops/kde-4.5/sdk/find-svn.patch Normal file
View file

@ -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)