me
/
guix
Archived
1
0
Fork 0
Code

gnu: json-glib: Remove patch-docbook-xml phase. 

* gnu/packages/gnome.scm (json-glib) [arguments]: Remove patch-docbook-xml
phase.  Use gexps.
[native-inputs]: Use modify-inputs.  Remove labels.
master
Maxim Cournoyer 2023-04-20 16:05:25 -04:00
parent 35ba2fa4c2
commit 7aff6a08c7
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
gnu/packages/gnome.scm
View File

@ -4715,53 +4715,38 @@ GLib and GObject, and integrates JSON with GLib data types.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments json-glib-minimal) (substitute-keyword-arguments (package-arguments json-glib-minimal)
((#:configure-flags _) ((#:configure-flags _)
`(list "-Ddocs=true" #~(list "-Ddocs=true"
"-Dman=true" "-Dman=true"
,@(if (%current-target-system) #$@(if (%current-target-system)
;; If enabled, gtkdoc-scangobj will try to execute a ;; If enabled, gtkdoc-scangobj will try to execute a
;; cross-compiled binary. ;; cross-compiled binary.
'("-Dgtk_doc=disabled" #~("-Dgtk_doc=disabled"
;; Trying to build introspection data when cross-compiling ;; Trying to build introspection data when cross-compiling
;; causes errors during linking. ;; causes errors during linking.
"-Dintrospection=disabled") "-Dintrospection=disabled")
'()))) #~())))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'patch-docbook
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "doc"
(substitute* (find-files "." "\\.xml$")
(("http://www.oasis-open.org/docbook/xml/4\\.3/")
(string-append (assoc-ref (or native-inputs inputs)
"docbook-xml")
"/xml/dtd/docbook/")))
(substitute* "meson.build"
(("http://docbook.sourceforge.net/release/xsl/current/")
(string-append (assoc-ref (or native-inputs inputs)
"docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/"))))))
;; When cross-compiling, there are no docs to move. ;; When cross-compiling, there are no docs to move.
,(if (%current-target-system) #$@(if (%current-target-system)
'(add-after 'install 'stub-docs #~((add-after 'install 'stub-docs
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; The daemon doesn't like empty output paths. ;; The daemon doesn't like empty output paths.
(mkdir (assoc-ref outputs "doc")))) (mkdir #$output:doc))))
'(add-after 'install 'move-docs #~((add-after 'install 'move-docs
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (mkdir-p (string-append #$output:doc "/share"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share"))
(rename-file (rename-file
(string-append out "/share/gtk-doc") (string-append #$output "/share/gtk-doc")
(string-append doc "/share/gtk-doc")))))))))) (string-append #$output:doc
"/share/gtk-doc"))))))))))
(native-inputs (native-inputs
(append (modify-inputs (package-native-inputs json-glib-minimal)
`(("docbook-xml" ,docbook-xml-4.3) (prepend docbook-xml-4.3
("docbook-xsl" ,docbook-xsl) docbook-xsl
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc) gtk-doc
("xsltproc" ,libxslt)) libxslt)))))
(package-native-inputs json-glib-minimal)))))
(define-public libxklavier (define-public libxklavier
(package (package