Author: urkud
Date: Thu Aug 12 13:01:06 2010
New Revision: 23147
URL: https://svn.nixos.org/websvn/nix/?rev=23147&sc=1
Log:
Remove old patch, add new one
Let other KDE modules install polkit policy files to $out,
not $kdelibs
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/polkit-install.patch
Deleted:
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 Thu Aug 12
12:53:51 2010 (r23146)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Thu Aug 12
13:01:06 2010 (r23147)
@@ -18,6 +18,8 @@
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"
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/polkit-install.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/polkit-install.patch Thu Aug
12 13:01:06 2010 (r23147)
@@ -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)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
