[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/135: gnu: gnome-keyring: Add missing input.
From: |
guix-commits |
Subject: |
113/135: gnu: gnome-keyring: Add missing input. |
Date: |
Fri, 21 Dec 2018 14:37:48 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 178f9f4ebcb0347e41cb354ee129249b1f6747c0
Author: Ricardo Wurmus <address@hidden>
Date: Wed Dec 5 17:30:02 2018 +0100
gnu: gnome-keyring: Add missing input.
* gnu/packages/gnome.scm (gnome-keyring)[native-inputs]: Add glib.
[arguments]: Move "fix-docbook" phase after "unpack" phase.
---
gnu/packages/gnome.scm | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 71e6df3..509d7f2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -696,25 +696,24 @@ GNOME Desktop.")
(substitute* "po/Makefile.in.in"
(("/bin/sh") (which "sh")))
#t))
- (add-before
- 'configure 'fix-docbook
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "docs/Makefile.am"
-
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)
- "/manpages/docbook.xsl")))
- (setenv "XML_CATALOG_FILES"
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/catalog.xml"))
- ;; Rerun the whole thing to avoid version mismatch ("This is
- ;; Automake 1.15.1, but the definition used by this
- ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't
- ;; use 'autoreconf' because it insists on running 'libtoolize'.
- (invoke "autoconf")
- (invoke "aclocal")
- (invoke "automake" "-ac"))))))
+ (add-after 'unpack 'fix-docbook
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "docs/Makefile.am"
+
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
+ (string-append (assoc-ref inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-"
+ ,(package-version docbook-xsl)
+ "/manpages/docbook.xsl")))
+ (setenv "XML_CATALOG_FILES"
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/catalog.xml"))
+ ;; Rerun the whole thing to avoid version mismatch ("This is
+ ;; Automake 1.15.1, but the definition used by this
+ ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't
+ ;; use 'autoreconf' because it insists on running 'libtoolize'.
+ (invoke "autoconf")
+ (invoke "aclocal")
+ (invoke "automake" "-ac"))))))
(inputs
`(("libgcrypt" ,libgcrypt)
("linux-pam" ,linux-pam)
@@ -724,6 +723,7 @@ GNOME Desktop.")
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin")
+ ("glib" ,glib) ; for m4 macros
("python" ,python-2) ;for tests
("intltool" ,intltool)
("autoconf" ,autoconf)
- 106/135: gnu: pangomm: Update to 2.42.0., (continued)
- 106/135: gnu: pangomm: Update to 2.42.0., guix-commits, 2018/12/21
- 25/135: gnu: gnumeric: Update to 1.12.41., guix-commits, 2018/12/21
- 21/135: gnu: gsettings-desktop-schemas: Update to 3.28.0., guix-commits, 2018/12/21
- 36/135: gnu: gvfs: Update to 1.36.2., guix-commits, 2018/12/21
- 66/135: gnu: network-manager-applet: Update to 1.8.14., guix-commits, 2018/12/21
- 26/135: gnu: glib-networking: Update to 2.56.1., guix-commits, 2018/12/21
- 46/135: gnu: mutter: Update to 3.28.2., guix-commits, 2018/12/21
- 110/135: gnu: gnome-calculator: Update to 3.30.1., guix-commits, 2018/12/21
- 58/135: gnu: tracker: Update to 2.0.4., guix-commits, 2018/12/21
- 20/135: gnu: gcr: Update to 3.28.0., guix-commits, 2018/12/21
- 113/135: gnu: gnome-keyring: Add missing input.,
guix-commits <=
- 33/135: gnu: libgudev: Update to 232., guix-commits, 2018/12/21
- 48/135: gnu: gnome-system-monitor: Update to 3.28.2., guix-commits, 2018/12/21
- 61/135: gnu: gnome-control-center: Update to 3.28.2., guix-commits, 2018/12/21
- 74/135: gnu: atk: Update to 2.30.0., guix-commits, 2018/12/21
- 69/135: gnu: libimobiledevice: Do not hardcode Python version., guix-commits, 2018/12/21
- 125/135: gnu: epiphany: Update to 3.30.2., guix-commits, 2018/12/21
- 76/135: gnu: glib: Update to 2.58.1., guix-commits, 2018/12/21
- 105/135: gnu: atkmm: Update to 2.28.0., guix-commits, 2018/12/21
- 53/135: gnu: Add libdazzle., guix-commits, 2018/12/21