diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-12 13:24:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-12 13:24:35 +0000 |
| commit | c3e3111231177af3311db6853fd5b200fda07528 (patch) | |
| tree | f9cfc2ea8cf8f5f36553033a92061cf77ce27c69 /pkgs/development/libraries/polkit-qt-1 | |
| parent | b39f08ea8e7fc6e5499097798308c653b812ff2f (diff) | |
| download | nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar.gz nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar.bz2 nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar.lz nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar.xz nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.tar.zst nixpkgs-c3e3111231177af3311db6853fd5b200fda07528.zip | |
* Add kde-workspace.
* Make sure that polkit actions get installed in $out. svn path=/nixpkgs/branches/kde-4.7/; revision=27737
Diffstat (limited to 'pkgs/development/libraries/polkit-qt-1')
| -rw-r--r-- | pkgs/development/libraries/polkit-qt-1/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/polkit-qt-1/polkit-install.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 7e00c115b10..008a75cff67 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r"; }; + patches = [ ./polkit-install.patch ]; + buildInputs = [ cmake qt4 automoc4 ]; propagatedBuildInputs = [ polkit glib ]; diff --git a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch new file mode 100644 index 00000000000..79beda2a318 --- /dev/null +++ b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in +--- polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in 2010-12-08 18:22:28.000000000 +0100 ++++ polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in 2011-07-12 13:26:51.000000000 +0200 +@@ -15,7 +15,7 @@ + + set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1") + set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") +-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") ++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + + # Compatibility + if(WIN32) |