[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/18: gnu: gnustep: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
11/18: gnu: gnustep: Update phase style. |
Date: |
Fri, 16 Feb 2018 05:15:21 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit bfe83d568c75434501a471dbaed273d213320470
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Thu Feb 15 23:28:51 2018 +0100
gnu: gnustep: Update phase style.
* gnu/packages/gnustep.scm (windowmaker)[arguments]: Don't use %OUTPUT.
End phases with #t.
(wmbattery, wmclock)[arguments]: Substitute INVOKE for SYSTEM*. End
phases with #t.
---
gnu/packages/gnustep.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index dd49386..05ad9b7 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -102,7 +102,8 @@ to easily create cross-compiled binaries.")
;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;")
- (string-append "len = strlen(text) + 107;"))))))
+ (string-append "len = strlen(text) + 107;")))
+ #t)))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -120,7 +121,7 @@ to easily create cross-compiled binaries.")
(string-map (match-lambda
(#\newline #\space)
(chr chr))
- ,synopsis) %output))))
+ ,synopsis) out))))
#t))
(add-after 'install-xsession 'wrap
(lambda* (#:key outputs #:allow-other-keys)
@@ -129,7 +130,8 @@ to easily create cross-compiled binaries.")
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst")
- `("PATH" ":" prefix (,bin)))))))))
+ `("PATH" ":" prefix (,bin)))
+ #t))))))
(inputs
`(("libxmu" ,libxmu)
("libxft" ,libxft)
@@ -170,7 +172,9 @@ interface. It is fast, feature rich, easy to configure,
and easy to use.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoconf
- (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+ (lambda _
+ (invoke "autoreconf" "-vfi")
+ #t)))))
(inputs
`(("glib" ,glib)
("libx11" ,libx11)
@@ -262,7 +266,9 @@ on.")
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoconf
- (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+ (lambda _
+ (invoke "autoreconf" "-vfi")
+ #t)))))
;; wmclock requires autoreconf to generate its configure script.
(inputs
`(("libx11" ,libx11)
- 04/18: gnu: lziprecover: Update to 1.20., (continued)
- 04/18: gnu: lziprecover: Update to 1.20., Tobias Geerinckx-Rice, 2018/02/16
- 06/18: gnu: lzlib: Update to 1.10., Tobias Geerinckx-Rice, 2018/02/16
- 05/18: gnu: clzip: Update to 1.10., Tobias Geerinckx-Rice, 2018/02/16
- 18/18: gnu: perl-dbd-pg: Update to 3.7.4., Tobias Geerinckx-Rice, 2018/02/16
- 13/18: gnu: gkrellm: Update to 2.3.10., Tobias Geerinckx-Rice, 2018/02/16
- 12/18: gnu: gnustep: Update dockapps home pages., Tobias Geerinckx-Rice, 2018/02/16
- 01/18: gnu: lzop: Update to 1.04., Tobias Geerinckx-Rice, 2018/02/16
- 02/18: gnu: lzop: Use HTTPS home page., Tobias Geerinckx-Rice, 2018/02/16
- 03/18: gnu: pbzip2: Update to 1.1.13., Tobias Geerinckx-Rice, 2018/02/16
- 07/18: gnu: plzip: Update to 1.7., Tobias Geerinckx-Rice, 2018/02/16
- 11/18: gnu: gnustep: Update phase style.,
Tobias Geerinckx-Rice <=
- 15/18: gnu: erlang: Update phase style., Tobias Geerinckx-Rice, 2018/02/16
- 14/18: gnu: erlang: Update to 20.2.3., Tobias Geerinckx-Rice, 2018/02/16
- 16/18: gnu: opusfile: Update to 0.10., Tobias Geerinckx-Rice, 2018/02/16
- 08/18: gnu: Use HTTPS for supported nongnu.org home pages., Tobias Geerinckx-Rice, 2018/02/16
- 17/18: gnu: ristretto: Update to 0.8.2., Tobias Geerinckx-Rice, 2018/02/16
- 10/18: gnu: wmcpuload: Update to 1.1.1., Tobias Geerinckx-Rice, 2018/02/16
- 09/18: gnu: wmbattery: Update to 2.51., Tobias Geerinckx-Rice, 2018/02/16