branch core-updates-frozen updated: gnu: kdeconnect: Fix build.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 6ae59e7  gnu: kdeconnect: Fix build.
6ae59e7 is described below

commit 6ae59e7d792c8339a5f6df8bc4eca42ab8ca7457
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Aug 10 09:37:28 2021 +0300

    gnu: kdeconnect: Fix build.
    
    * gnu/packages/kde.scm (kdeconnect)[arguments]: Replace custom
    'extend-CPLUS_INCLUDE_PATH with 'adjust-include-header to fix finding
    all header files.
---
 gnu/packages/kde.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3fa15f9..bcf7146 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -715,15 +715,13 @@ different notification systems.")
     (arguments
      `(#:configure-flags '("-DBUILD_TESTING=ON"
                            "-DKDE_INSTALL_LIBEXECDIR=libexec")
-       #:phases (modify-phases %standard-phases
-                  (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      ;; FIXME: <kcmutils_version.h> is not found during one
-                      ;; of the compilation steps without this hack.
-                      (setenv "CPLUS_INCLUDE_PATH"
-                              (string-append
-                               (search-input-directory inputs "include/KF5")
-                               ":" (or (getenv "CPLUS_INCLUDE_PATH") ""))))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'adjust-include-header
+           (lambda _
+             (substitute* "plugins/runcommand/runcommandplugin.cpp"
+               (("<kcmutils_version.h>")
+                "<KF5/kcmutils_version.h>")))))
        #:tests? #f)) ; tests fail hard in our build environment
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)