Author: urkud
Date: Mon Aug 2 17:17:06 2010
New Revision: 22893
URL: https://svn.nixos.org/websvn/nix/?rev=22893&sc=1
Log:
kdelibs-4.4.95: fix python install dir
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Mon Aug 2
17:16:24 2010 (r22892)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Mon Aug 2
17:17:06 2010 (r22893)
@@ -20,6 +20,8 @@
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
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
Mon Aug 2 17:17:06 2010 (r22893)
@@ -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)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
