[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/66: gnu: elogind: Return #t from all phases.
From: |
Mark H. Weaver |
Subject: |
06/66: gnu: elogind: Return #t from all phases. |
Date: |
Fri, 23 Mar 2018 04:46:40 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 3f54fd1ea58fc8c21393fac466c0b168016b70db
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 23 01:57:20 2018 -0400
gnu: elogind: Return #t from all phases.
* gnu/packages/freedesktop.scm (elogin)[arguments]: Return #t from all
phases.
Use invoke and remove vestigial plumbing in the 'autogen' phase.
---
gnu/packages/freedesktop.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9c70d90..c981271 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -275,11 +275,12 @@ the freedesktop.org XDG Base Directory specification.")
;; Fix compilation with glibc >= 2.26, which removed xlocale.h.
;; This can be removed for elogind 234.
(substitute* "src/basic/parse-util.c"
- (("xlocale\\.h") "locale.h"))))
+ (("xlocale\\.h") "locale.h"))
+ #t))
(add-before 'configure 'autogen
(lambda _
- (and (zero? (system* "intltoolize" "--force" "--automake"))
- (zero? (system* "autoreconf" "-vif")))))
+ (invoke "intltoolize" "--force" "--automake")
+ (invoke "autoreconf" "-vif")))
(add-before 'build 'fix-service-file
(lambda* (#:key outputs #:allow-other-keys)
;; Fix the file name of the 'elogind' binary in the D-Bus
@@ -287,7 +288,8 @@ the freedesktop.org XDG Base Directory specification.")
(substitute* "src/login/org.freedesktop.login1.service"
(("^Exec=.*")
(string-append "Exec=" (assoc-ref %outputs "out")
- "/libexec/elogind/elogind\n")))))
+ "/libexec/elogind/elogind\n")))
+ #t))
(add-after 'install 'add-libcap-to-search-path
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Add a missing '-L' for libcap in libelogind.la. See
- 17/66: gnu: ghostscript: Use invoke., (continued)
- 17/66: gnu: ghostscript: Use invoke., Mark H. Weaver, 2018/03/23
- 16/66: gnu: gettext-minimal: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 11/66: gnu: fontconfig: Use invoke., Mark H. Weaver, 2018/03/23
- 19/66: gnu: glibc-hurd-headers: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 21/66: gnu: gnumach-headers: Use invoke., Mark H. Weaver, 2018/03/23
- 23/66: gnu: hurd-minimal: Use invoke., Mark H. Weaver, 2018/03/23
- 20/66: gnu: gmime: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 22/66: gnu: hurd-headers: Use invoke., Mark H. Weaver, 2018/03/23
- 18/66: gnu: git: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 27/66: gnu: gnumach: Use invoke., Mark H. Weaver, 2018/03/23
- 06/66: gnu: elogind: Return #t from all phases.,
Mark H. Weaver <=
- 30/66: gnu: imagemagick: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 28/66: gnu: icecat: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 09/66: gnu: faad2: Use invoke., Mark H. Weaver, 2018/03/23
- 31/66: gnu: perl-image-magick: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 05/66: gnu: dejagnu: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 26/66: gnu: guix: Use invoke., Mark H. Weaver, 2018/03/23
- 13/66: gnu: cross-base: Use invoke in (gnu build cross-toolchain)., Mark H. Weaver, 2018/03/23
- 29/66: gnu: ijs: Use invoke., Mark H. Weaver, 2018/03/23
- 12/66: gnu: gawk: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 36/66: gnu: libssh2: Use invoke., Mark H. Weaver, 2018/03/23