diff mbox series

[bug#70566] gnu: kauth: Fix KAUTH_HELPER_INSTALL_ABSOLUTE_DIR.

Message ID a51f1697f0fc5244ae83d8bfbbf250b7b33801d4.1714041115.git.iyzsong@member.fsf.org
State New
Headers show
Series [bug#70566] gnu: kauth: Fix KAUTH_HELPER_INSTALL_ABSOLUTE_DIR. | expand

Commit Message

vasilii.smirnov--- via Guix-patches" via April 25, 2024, 10:32 a.m. UTC
From: 宋文武 <iyzsong@member.fsf.org>

KAuth helpers use KAUTH_HELPER_INSTALL_ABSOLUTE_DIR as the prefix for "Exec="
in their dbus service files, which should really be an absolute directory.

Fixes <https://issues.guix.gnu.org/70529>.

* gnu/packages/kde-frameworks.scm (kauth)[arguments]<#:phases>: In
fix-cmake-install-directories phase, replace KAUTH_HELPER_INSTALL_DIR
with '${KDE_INSTALL_LIBEXECDIR}/kauth' and KAUTH_HELPER_INSTALL_ABSOLUTE_DIR
with '${KDE_INSTALL_FULL_LIBEXECDIR}/kauth'.

Change-Id: I57920c59dca503fd4bc8727cb35e1b0fb6016e56
---
 gnu/packages/kde-frameworks.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: 4514239971895fc7ad47c7752e30d98a0c44a154

Comments

Maxim Cournoyer April 28, 2024, 2:48 p.m. UTC | #1
Hi,

iyzsong@envs.net writes:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> KAuth helpers use KAUTH_HELPER_INSTALL_ABSOLUTE_DIR as the prefix for "Exec="
> in their dbus service files, which should really be an absolute directory.
>
> Fixes <https://issues.guix.gnu.org/70529>.
>
> * gnu/packages/kde-frameworks.scm (kauth)[arguments]<#:phases>: In
> fix-cmake-install-directories phase, replace KAUTH_HELPER_INSTALL_DIR
> with '${KDE_INSTALL_LIBEXECDIR}/kauth' and KAUTH_HELPER_INSTALL_ABSOLUTE_DIR
> with '${KDE_INSTALL_FULL_LIBEXECDIR}/kauth'.

Applied!
diff mbox series

Patch

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 95c0f95e8c..8991c36f89 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1645,9 +1645,9 @@  (define-public kauth
                 (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
                  "${KDE_INSTALL_DATADIR}/polkit-1/actions")
                 (("@KAUTH_HELPER_INSTALL_DIR@")
-                 "${KDE_INSTALL_LIBEXECDIR}")
+                 "${KDE_INSTALL_LIBEXECDIR}/kauth")
                 (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
-                 "${KDE_INSTALL_LIBEXECDIR}"))))
+                 "${KDE_INSTALL_FULL_LIBEXECDIR}/kauth"))))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?