[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/09: gnu: retroarch: Don't use %OUTPUT.
From: |
Tobias Geerinckx-Rice |
Subject: |
08/09: gnu: retroarch: Don't use %OUTPUT. |
Date: |
Wed, 29 Mar 2017 16:05:15 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 05e0ac46ef0118b92f6d9002a2c4333c22c89423
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Wed Mar 29 20:13:30 2017 +0200
gnu: retroarch: Don't use %OUTPUT.
* gnu/packages/games.scm (retroarch)[arguments]: Accept an OUTPUTS key
in the configure phase. Add a comment about the script. Use LET*.
---
gnu/packages/games.scm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0071056..b4498c6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1096,17 +1096,21 @@ either by Infocom or created using the Inform
compiler.")
(base32 "1xar0wagcz50clwwkvjg4zq9m1sjqw47vw3xx44pisdj94g21m5y"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no tests
+ '(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda _
- (substitute* "qb/qb.libs.sh"
- (("/bin/true") (which "true")))
- (zero? (system*
- "./configure"
- (string-append "--prefix=" %output)
- (string-append "--global-config-dir=" %output
"/etc"))))))))
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (etc (string-append out "/etc")))
+ (substitute* "qb/qb.libs.sh"
+ (("/bin/true") (which "true")))
+ ;; The configure script does not yet accept the extra arguments
+ ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
+ (zero? (system*
+ "./configure"
+ (string-append "--prefix=" out)
+ (string-append "--global-config-dir=" etc)))))))))
(inputs
`(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg)
- branch master updated (8615da9 -> a29d329), Tobias Geerinckx-Rice, 2017/03/29
- 06/09: gnu: glulxe: Fix typo., Tobias Geerinckx-Rice, 2017/03/29
- 09/09: gnu: games: Don't MKDIR before INSTALL-FILE., Tobias Geerinckx-Rice, 2017/03/29
- 01/09: gnu: Add httpfs2., Tobias Geerinckx-Rice, 2017/03/29
- 05/09: gnu: glkterm: Use @code in description., Tobias Geerinckx-Rice, 2017/03/29
- 02/09: gnu: hyperrogue: Improve description., Tobias Geerinckx-Rice, 2017/03/29
- 03/09: gnu: zstd: Update to 1.1.4., Tobias Geerinckx-Rice, 2017/03/29
- 04/09: gnu: games: Use INSTALL-FILE., Tobias Geerinckx-Rice, 2017/03/29
- 08/09: gnu: retroarch: Don't use %OUTPUT.,
Tobias Geerinckx-Rice <=
- 07/09: gnu: games: Use ‘modify-phases’., Tobias Geerinckx-Rice, 2017/03/29