me/guix
Archived
1
0
Fork 0
Code Activity

gnu: wayland: Use native-inputs unconditionally

Browse source 
* gnu/packages/freedesktop.scm (wayland): Remove trailing #t.
[phases]: Use native-inputs unconditionally.
This commit is contained in:
Maxim Cournoyer 2021-11-19 20:45:09 -05:00
parent afacad8b67
commit cb09adc093
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/freedesktop.scm
View file

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