gnu: kdbusaddons: Use gexp.

* gnu/packages/kde-frameworks.scm (kdbusadons, kdbusaddons-bootstrap): Use
gexp.

(kdbusaddons-bootstrap) [inputs]: Use modify-inputs.

Signed-off-by: Marius Bakke <marius@gnu.org>

gnu/packages/kde-frameworks.scm

@@ -680,8 +680,8 @@ (define-public kdbusaddons
      (list qtbase-5 qtx11extras kinit-bootstrap))
     ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
+     (list #:phases
+       #~(modify-phases %standard-phases
          (add-before 'configure 'patch-source
           (lambda* (#:key inputs #:allow-other-keys)
             ;; look for the kdeinit5 executable in kinit's store directory,
@@ -689,7 +689,8 @@ (define-public kdbusaddons
             (substitute* "src/kdeinitinterface.cpp"
               (("<< QCoreApplication::applicationDirPath..")
                (string-append
-                "<< QString::fromUtf8(\"" (assoc-ref inputs "kinit") "/bin\")" )))))
+                "<< QString::fromUtf8(\"/" (dirname (search-input-file inputs
+                "bin/kdeinit5")) "\")" )))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
@@ -3437,11 +3438,11 @@ (define kdbusaddons-bootstrap
     (source (origin
               (inherit (package-source kdbusaddons))
               (patches '())))
-    (inputs (alist-delete "kinit" (package-inputs kdbusaddons)))
+    (inputs (modify-inputs (package-inputs kdbusaddons) (delete "kinit")))
     (arguments
      (substitute-keyword-arguments (package-arguments kdbusaddons)
        ((#:phases phases)
-        `(modify-phases ,phases
+        #~(modify-phases #$phases
            (delete 'patch-source)))))))
 
 (define kinit-bootstrap