me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnome-keyring: Add missing input. 

* gnu/packages/gnome.scm (gnome-keyring)[native-inputs]: Add glib.
[arguments]: Move "fix-docbook" phase after "unpack" phase.
master
Ricardo Wurmus 2018-12-05 17:30:02 +01:00 committed by Kei Kebreau
parent b74ef0bae7
commit 5120f24f0e
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gnu/packages/gnome.scm
View File

@ -705,25 +705,24 @@ GNOME Desktop.")
(substitute* "po/Makefile.in.in" (substitute* "po/Makefile.in.in"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #t))
(add-before (add-after 'unpack 'fix-docbook
'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys) (substitute* "docs/Makefile.am"
(substitute* "docs/Makefile.am" (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") (string-append (assoc-ref inputs "docbook-xsl")
(string-append (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-"
"/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
,(package-version docbook-xsl) "/manpages/docbook.xsl")))
"/manpages/docbook.xsl"))) (setenv "XML_CATALOG_FILES"
(setenv "XML_CATALOG_FILES" (string-append (assoc-ref inputs "docbook-xml")
(string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml"))
"/xml/dtd/docbook/catalog.xml")) ;; Rerun the whole thing to avoid version mismatch ("This is
;; Rerun the whole thing to avoid version mismatch ("This is ;; Automake 1.15.1, but the definition used by this
;; Automake 1.15.1, but the definition used by this ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't
;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't ;; use 'autoreconf' because it insists on running 'libtoolize'.
;; use 'autoreconf' because it insists on running 'libtoolize'. (invoke "autoconf")
(invoke "autoconf") (invoke "aclocal")
(invoke "aclocal") (invoke "automake" "-ac"))))))
(invoke "automake" "-ac"))))))
(inputs (inputs
`(("libgcrypt" ,libgcrypt) `(("libgcrypt" ,libgcrypt)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
@ -733,6 +732,7 @@ GNOME Desktop.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ("glib" ,glib "bin")
("glib" ,glib) ; for m4 macros
("python" ,python-2) ;for tests ("python" ,python-2) ;for tests
("intltool" ,intltool) ("intltool" ,intltool)
("autoconf" ,autoconf) ("autoconf" ,autoconf)