JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdelibs-4.5.90

Browse Source 
svn path=/nixpkgs/trunk/; revision=25287
This commit is contained in:
Yury G. Kudryashov 2010-12-26 15:27:33 +00:00
parent 20bffe3591
commit 14e49759aa
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/kde-4.6/libs/default.nix
View File

@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee, hupnp
}:
kde.package {
@ -10,7 +10,7 @@ kde.package {
buildInputs = [
cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell
enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee hupnp
];
# TODO: make sonnet plugins (dictionaries) really work.
@ -21,8 +21,6 @@ kde.package {
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
shared_desktop_ontologies ];
patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR, hspell
cmakeFlags = ''
@ -36,7 +34,7 @@ kde.package {
license = "LGPL";
kde = {
name = "kdelibs";
version = "4.5.4";
version = "4.5.90";
};
};
}

12
pkgs/desktops/kde-4.6/libs/polkit-install.patch
View File

@ -1,12 +0,0 @@
Author: Yury Kudryashov
Reason: other KDE modules try to install polkit action files into
$kdelibs/share/polkit-1/actions
Upstream: rejected, they propose to set install dir in each package
--- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000 +0400
+++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000 +0400
@@ -101,4 +101,4 @@
endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
endif (POLKITQT-1_FOUND)
-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions)