From 1e095067cc31dbff6648836bcbc969f88eabe926 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Aug 2010 17:17:06 +0000 Subject: [PATCH] kdelibs-4.4.95: fix python install dir svn path=/nixpkgs/trunk/; revision=22893 --- pkgs/desktops/kde-4.5/libs/default.nix | 2 ++ .../libs/python-site-packages-install-dir.diff | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index 05d37485aad6..216011fdc5f5 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { automoc4 strigi soprano qca2 attica ]; + patches = [ ./python-site-packages-install-dir.diff ]; + propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ]; # cmake fails to find acl.h because of C++-style comment 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 new file mode 100644 index 000000000000..05b280838c4d --- /dev/null +++ b/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff @@ -0,0 +1,13 @@ +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)