From 47234c396061d5bb80d9c4fa1e330f1a3875d8d7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Fri, 18 Nov 2022 09:58:06 +0100
Subject: gnu: xdg-utils: Use G-expression.

* gnu/packages/freedesktop.scm (xdg-utils)[arguments]: Use gexp.
---
 gnu/packages/freedesktop.scm | 102 ++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 50 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 5684bb1b94..672de9d55b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -497,57 +497,59 @@ (define-public xdg-utils
            xprop                        ;for Xfce detecting
            xset))                       ;for xdg-screensaver
     (arguments
-     `(#:tests? #f                      ;no check target
-       #:modules ((srfi srfi-26)
+     (list
+      #:tests? #f                       ;no check target
+      #:modules `((srfi srfi-26)
                   ,@%gnu-build-system-modules)
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-hardcoded-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "scripts/xdg-mime.in"
-               (("/usr/bin/file")
-                (search-input-file inputs "bin/file")))
-             (substitute* "scripts/xdg-open.in"
-               (("/usr/bin/printf")
-                (search-input-file inputs "bin/printf")))))
-         (add-before 'build 'locate-catalog-files
-           (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (let* ((native (or native-inputs inputs))
-                    (xmldoc (search-input-directory native
-                                                    "xml/dtd/docbook"))
-                    (xsldoc (search-input-directory
-                             native
-                             (string-append "xml/xsl/docbook-xsl-"
-                                            ,(package-version docbook-xsl)))))
-               (for-each (lambda (file)
-                           (substitute* file
-                             (("http://.*/docbookx\\.dtd")
-                              (string-append xmldoc "/docbookx.dtd"))))
-                         (find-files "scripts/desc" "\\.xml$"))
-               (substitute* "scripts/Makefile"
-                 ;; Apparently `xmlto' does not bother to looks up the stylesheets
-                 ;; specified in the XML, unlike the above substitition. Instead it
-                 ;; uses a hard-coded URL. Work around it here, but if this is
-                 ;; common perhaps we should hardcode this path in xmlto itself.
-                 (("\\$\\(XMLTO\\) man")
-                  (string-append "$(XMLTO) -x " xsldoc
-                                 "/manpages/docbook.xsl man")))
-               (setenv "STYLESHEET"
-                       (string-append xsldoc "/html/docbook.xsl")))))
-         (add-after 'install 'wrap-executables
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
-                                    "sed" "xprop" "xset"))
-                    (pkgs (map (lambda (cmd)
-                                 (search-input-file inputs
-                                                    (string-append "bin/" cmd)))
-                               dependencies))
-                    (bindirs (map dirname pkgs)))
-               (with-directory-excursion (string-append out "/bin")
-                 (for-each (cute wrap-program <>
-                                 `("PATH" ":" prefix ,bindirs))
-                           (find-files ".")))))))))
+      #:phases
+      #~(modify-phases %standard-phases
+        (add-after 'unpack 'patch-hardcoded-paths
+          (lambda* (#:key inputs #:allow-other-keys)
+            (substitute* "scripts/xdg-mime.in"
+              (("/usr/bin/file")
+               (search-input-file inputs "bin/file")))
+            (substitute* "scripts/xdg-open.in"
+              (("/usr/bin/printf")
+               (search-input-file inputs "bin/printf")))))
+        (add-before 'build 'locate-catalog-files
+          (lambda* (#:key native-inputs inputs #:allow-other-keys)
+            (let* ((native (or native-inputs inputs))
+                   (xmldoc (search-input-directory native
+                                                   "xml/dtd/docbook"))
+                   (xsldoc (search-input-directory
+                            native
+                            (string-append "xml/xsl/docbook-xsl-"
+                                           #$(package-version
+                                              (this-package-native-input
+                                               "docbook-xsl"))))))
+              (for-each (lambda (file)
+                          (substitute* file
+                            (("http://.*/docbookx\\.dtd")
+                             (string-append xmldoc "/docbookx.dtd"))))
+                        (find-files "scripts/desc" "\\.xml$"))
+              (substitute* "scripts/Makefile"
+                ;; Apparently `xmlto' does not bother to looks up the stylesheets
+                ;; specified in the XML, unlike the above substitition. Instead it
+                ;; uses a hard-coded URL. Work around it here, but if this is
+                ;; common perhaps we should hardcode this path in xmlto itself.
+                (("\\$\\(XMLTO\\) man")
+                 (string-append "$(XMLTO) -x " xsldoc
+                                "/manpages/docbook.xsl man")))
+              (setenv "STYLESHEET"
+                      (string-append xsldoc "/html/docbook.xsl")))))
+        (add-after 'install 'wrap-executables
+          (lambda* (#:key inputs outputs #:allow-other-keys)
+            (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
+                                   "sed" "xprop" "xset"))
+                   (pkgs (map (lambda (cmd)
+                                (search-input-file inputs
+                                                   (string-append "bin/" cmd)))
+                              dependencies))
+                   (bindirs (map dirname pkgs)))
+              (with-directory-excursion (string-append #$output "/bin")
+                (for-each (cute wrap-program <>
+                                `("PATH" ":" prefix ,bindirs))
+                          (find-files ".")))))))))
     (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/")
     (synopsis "Freedesktop.org scripts for desktop integration")
     (description "The xdg-utils package is a set of simple scripts that
-- 
cgit v1.2.3