diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/desktops/kde-4.5/libs/polkit-install.patch | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/desktops/kde-4.5/libs/polkit-install.patch')
| -rw-r--r-- | pkgs/desktops/kde-4.5/libs/polkit-install.patch | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.5/libs/polkit-install.patch b/pkgs/desktops/kde-4.5/libs/polkit-install.patch index 68bf55487963..6633ef1209b4 100644 --- a/pkgs/desktops/kde-4.5/libs/polkit-install.patch +++ b/pkgs/desktops/kde-4.5/libs/polkit-install.patch @@ -1,6 +1,7 @@ Author: Yury Kudryashov Reason: other KDE modules try to install polkit action files into $kdelibs/share/polkit-1/actions +Upstream: rejected, they propose to set install dir in each package --- 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 @@ |