nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old patch, add new one

Browse Source 
Let other KDE modules install polkit policy files to $out,
not $kdelibs

svn path=/nixpkgs/trunk/; revision=23147
This commit is contained in:
Yury G. Kudryashov 2010-08-12 13:01:06 +00:00
parent 63ce55d859
commit ca1914fa1a
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.5/libs/default.nix
View File

@ -18,6 +18,8 @@ kdePackage {
propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
cmakeFlags = [
"-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"

11
pkgs/desktops/kde-4.5/libs/polkit-install.patch Normal file
View File

@ -0,0 +1,11 @@
Author: Yury Kudryashov
Reason: other KDE modules try to install polkit action files into
$kdelibs/share/polkit-1/actions
--- 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)

13
pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
View File

@ -1,13 +0,0 @@
Source: upstream r1153602
Index: a/cmake/modules/SIPMacros.cmake
===================================================================
--- a/cmake/modules/SIPMacros.cmake (revision 1153601)
+++ b/cmake/modules/SIPMacros.cmake (revision 1153602)
@@ -119,6 +119,6 @@
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
- INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/${_parent_module_path}")
+ INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL_DIR}/${_parent_module_path}")
ENDMACRO(ADD_SIP_PYTHON_MODULE)