[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/49: gnu: gnome-keyring: Add missing input.
From: |
guix-commits |
Subject: |
28/49: gnu: gnome-keyring: Add missing input. |
Date: |
Sat, 4 May 2019 08:18:47 -0400 (EDT) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 87733421cad6fe93442a619f5c3b453fde939854
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 16e9960..97cbf3c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -702,25 +702,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)
@@ -730,6 +729,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)
- 14/49: gnu: vala: Update to 0.42.3., (continued)
- 14/49: gnu: vala: Update to 0.42.3., guix-commits, 2019/05/04
- 18/49: gnu: gnome-sudoku: Update to 3.30.0., guix-commits, 2019/05/04
- 10/49: gnu: libgnomeprint: Update to 2.18.8., guix-commits, 2019/05/04
- 13/49: gnu: seahorse: Update to 3.30., guix-commits, 2019/05/04
- 16/49: gnu: five-or-more: Update to 3.30.0., guix-commits, 2019/05/04
- 21/49: gnu: gtkmm: Update to 3.24.0., guix-commits, 2019/05/04
- 30/49: gnu: network-manager: Update to 1.14.4., guix-commits, 2019/05/04
- 11/49: gnu: libgnomeprintui: Update to 2.18.6., guix-commits, 2019/05/04
- 23/49: gnu: pangomm: Update to 2.42.0., guix-commits, 2019/05/04
- 29/49: gnu: gnome-settings-daemon: Update to 3.30.1.2., guix-commits, 2019/05/04
- 28/49: gnu: gnome-keyring: Add missing input.,
guix-commits <=
- 09/49: gnu: adwaita-icon-theme: Update to 3.30.1., guix-commits, 2019/05/04
- 12/49: gnu: libwnck: Update to 3.30.0., guix-commits, 2019/05/04
- 15/49: gnu: vte: Update to 0.54.2., guix-commits, 2019/05/04
- 20/49: gnu: glib: Install m4 macros., guix-commits, 2019/05/04
- 25/49: gnu: gnome-calculator: Update to 3.30.1., guix-commits, 2019/05/04
- 26/49: gnu: network-manager-applet: Update to 1.8.18., guix-commits, 2019/05/04
- 27/49: gnu: gdm: Update to 3.30.2., guix-commits, 2019/05/04
- 36/49: gnu: gnome-tweak-tool: Update to 3.30.1., guix-commits, 2019/05/04
- 31/49: gnu: network-manager-applet: Use meson build system., guix-commits, 2019/05/04
- 46/49: gnu: gnome-maps: Update to 3.30.2.1., guix-commits, 2019/05/04