about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@secure.mailbox.org>2017-07-06 06:12:07 -0500
committerGitHub <noreply@github.com>2017-07-06 06:12:07 -0500
commit039dda7a277a747fd5094563eac011e7c2cc96b9 (patch)
treed5d6154f78895592c1326ecaa33a2a575717bd86
parentbcfd8e7810935572cdad998ecbe5024f9dc6b921 (diff)
parenta63732f9b22f4687c647b2837afd0742640efb8b (diff)
downloadnixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar.gz
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar.bz2
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar.lz
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar.xz
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.tar.zst
nixlib-039dda7a277a747fd5094563eac011e7c2cc96b9.zip
Merge pull request #27157 from bkchr/kwallet_dbus_fix
kwallet: Fix bug that dbus could not find the kwallet service
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch9
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwallet.nix1
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
new file mode 100644
index 000000000000..00f3d8baedf9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
@@ -0,0 +1,9 @@
+diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
+index 76eb90e..7a78e83 100644
+--- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in
++++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.kde.kwalletd5
+-Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5
++Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index fca0dedd083e..ece915071ad0 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -15,4 +15,5 @@ mkDerivation {
     knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
   propagatedBuildInputs = [ qtbase ];
+  patches = [ ./kwallet-dbus.patch ];
 }