diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 18:04:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-14 18:04:10 +0000 |
| commit | 3d8668b71341c4771e4a9fa9e8141e94680e7fca (patch) | |
| tree | e595bfcd504d142650a6b3b694f4c2686b114745 /pkgs/desktops | |
| parent | 84d691d520333ed87b357f2a62277392581f7f2c (diff) | |
| download | nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar.gz nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar.bz2 nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar.lz nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar.xz nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.tar.zst nixlib-3d8668b71341c4771e4a9fa9e8141e94680e7fca.zip | |
Fix ksecrets build
svn path=/nixpkgs/trunk/; revision=31560
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch | 43 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix | 2 |
2 files changed, 45 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch new file mode 100644 index 000000000000..24a68e114406 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch @@ -0,0 +1,43 @@ +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 ############### + diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix index be562db92772..da9b7f0861cd 100644 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix +++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix @@ -3,6 +3,8 @@ kde { buildInputs = [ kdelibs qca2 ]; + patches = [ ./ksecrets-ftbfs.patch ]; + meta = { description = "KDE implementation of SecretsService"; }; |