diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-12 13:01:06 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-12 13:01:06 +0000 |
| commit | ca1914fa1a0751024a7a52f4344849e2e7f5d821 (patch) | |
| tree | 1811937bb2e4319cc087a168ef4729f877267195 /pkgs/desktops | |
| parent | 63ce55d85957404e469ae6556d7030de16375073 (diff) | |
| download | nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar.gz nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar.bz2 nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar.lz nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar.xz nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.tar.zst nixpkgs-ca1914fa1a0751024a7a52f4344849e2e7f5d821.zip | |
Remove old patch, add new one
Let other KDE modules install polkit policy files to $out, not $kdelibs svn path=/nixpkgs/trunk/; revision=23147
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.5/libs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.5/libs/polkit-install.patch | 11 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff | 13 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index c749223535b..b7bb4573a94 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -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" diff --git a/pkgs/desktops/kde-4.5/libs/polkit-install.patch b/pkgs/desktops/kde-4.5/libs/polkit-install.patch new file mode 100644 index 00000000000..68bf5548796 --- /dev/null +++ b/pkgs/desktops/kde-4.5/libs/polkit-install.patch @@ -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) diff --git a/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff deleted file mode 100644 index 05b280838c4..00000000000 --- a/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff +++ /dev/null @@ -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) |