guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/09: gnu: wayland: Use native-inputs unconditionally


From: guix-commits
Subject: 07/09: gnu: wayland: Use native-inputs unconditionally
Date: Sat, 20 Nov 2021 09:00:43 -0500 (EST)

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

commit cb09adc09305b342a902ee13d78abb2a7cee4cdd
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Nov 19 20:45:09 2021 -0500

    gnu: wayland: Use native-inputs unconditionally
    
    * gnu/packages/freedesktop.scm (wayland): Remove trailing #t.
    [phases]: Use native-inputs unconditionally.
---
 gnu/packages/freedesktop.scm | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 1d8a4c0..46bc051 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -996,24 +996,17 @@ Python.")
         #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook-xml
-           ;; TODO(core-updates): Use 'native-inputs' unconditionally
-           (lambda* (#:key ,@(if (%current-target-system)
-                                 '(native-inputs)
-                                 '())
-                     inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (with-directory-excursion "doc"
                (substitute* (find-files "." "\\.xml$")
                  (("http://www.oasis-open.org/docbook/xml/4\\.5/";)
-                  (string-append (assoc-ref ,(if (%current-target-system)
-                                                 '(or native-inputs inputs)
-                                                 'inputs) "docbook-xml")
+                  (string-append (assoc-ref (or native-inputs inputs)
+                                            "docbook-xml")
                                  "/xml/dtd/docbook/"))
                  (("http://www.oasis-open.org/docbook/xml/4\\.2/";)
-                  (string-append (assoc-ref ,(if (%current-target-system)
-                                                 '(or native-inputs inputs)
-                                                 'inputs) "docbook-xml-4.2")
-                                 "/xml/dtd/docbook/"))))
-             #t))
+                  (string-append (assoc-ref (or native-inputs inputs)
+                                            "docbook-xml-4.2")
+                                 "/xml/dtd/docbook/"))))))
          (add-after 'install 'move-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -1021,8 +1014,7 @@ Python.")
                (mkdir-p (string-append doc "/share"))
                (rename-file
                 (string-append out "/share/doc")
-                (string-append doc "/share/doc"))
-               #t))))))
+                (string-append doc "/share/doc"))))))))
     (native-inputs
      `(("docbook-xml-4.2" ,docbook-xml-4.2)
        ("docbook-xml" ,docbook-xml)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]