1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
nixpkgs/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch
Yury G. Kudryashov 3d8668b713 Fix ksecrets build
svn path=/nixpkgs/trunk/; revision=31560
2012-01-14 18:04:10 +00:00

44 lines
1.4 KiB
Diff

diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt
index 040b55f..a1e04c3 100644
--- a/ksecrets/CMakeLists.txt
+++ b/ksecrets/CMakeLists.txt
@@ -5,7 +5,6 @@ PROJECT (ksecrets)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
INCLUDE_DIRECTORIES (
${KDE4_INCLUDES}
diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt
index d2feb41..339225b 100644
--- a/ksecretsserviced/CMakeLists.txt
+++ b/ksecretsserviced/CMakeLists.txt
@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
INCLUDE_DIRECTORIES (
${KDE4_INCLUDES}
@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced
install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES ksecretsserviced.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-dbus_add_activation_service(org.kde.ksecretsserviced.service.in)
+configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt
index 41d8ec0..4cedb0e 100644
--- a/kwl2kss/CMakeLists.txt
+++ b/kwl2kss/CMakeLists.txt
@@ -3,7 +3,6 @@ project(kwl2kss)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
########### Configure checks for kwalletbackend ###############