[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/14: gnu: console-setup: Clean up #:make-flags.
From: |
guix-commits |
Subject: |
12/14: gnu: console-setup: Clean up #:make-flags. |
Date: |
Wed, 27 Jul 2022 19:08:10 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit a2bd3758c14b05038c861419b6b6816379514620
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 24 02:00:00 2022 +0200
gnu: console-setup: Clean up #:make-flags.
* gnu/packages/xorg.scm (console-setup)[arguments]: Properly
set #:make-flags once. Use them across all phases.
---
gnu/packages/xorg.scm | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6ba5c32dcb..ff633a192c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6586,9 +6586,9 @@ output.")
(build-system gnu-build-system)
(arguments
'(#:make-flags
- (let ((bash (assoc-ref %build-inputs "bash"))
- (out (assoc-ref %outputs "out")))
- (list (string-append "SHELL=" bash "/bin/bash")))
+ (list (string-append "SHELL=" (assoc-ref %build-inputs "bash")
+ "/bin/bash")
+ (string-append "prefix=" (assoc-ref %outputs "out")))
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
@@ -6601,22 +6601,13 @@ output.")
(("\"cat ")
(format #f "\"~a " (search-input-file inputs "bin/cat"))))))
(add-before 'build 'make-doubled-bdfs
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (invoke "make" "-C" "Fonts"
- "doubled_bdfs"
- (string-append "SHELL="
- (assoc-ref (or native-inputs inputs)
- "bash")
- "/bin/bash"))))
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "-C" "Fonts" "doubled_bdfs"
+ make-flags)))
(replace 'install
- (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref %outputs "out")))
- (invoke "make" "install-linux"
- (string-append "prefix=" out)
- (string-append "SHELL="
- (assoc-ref (or native-inputs inputs)
- "bash")
- "/bin/bash"))))))))
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "install-linux"
+ make-flags))))))
(native-inputs
(list pkg-config
bdftopcf
- branch master updated (97285a431b -> bdb2e262fc), guix-commits, 2022/07/27
- 03/14: gnu: btrbk: Use SEARCH-INPUT-FILES., guix-commits, 2022/07/27
- 09/14: gnu: duc: Run tests., guix-commits, 2022/07/27
- 07/14: gnu: Add mce-inject., guix-commits, 2022/07/27
- 12/14: gnu: console-setup: Clean up #:make-flags.,
guix-commits <=
- 10/14: gnu: console-setup: Update to 1.209., guix-commits, 2022/07/27
- 05/14: gnu: pegtl: Update to 3.2.7., guix-commits, 2022/07/27
- 04/14: gnu: libkeyfinder: Update to 2.2.7., guix-commits, 2022/07/27
- 13/14: gnu: console-setup: Use G-expressions., guix-commits, 2022/07/27
- 08/14: gnu: duc: Update to 1.4.5., guix-commits, 2022/07/27
- 01/14: gnu: btrbk: Add findutils to PATH., guix-commits, 2022/07/27
- 02/14: gnu: btrbk: Update to 0.32.2., guix-commits, 2022/07/27
- 06/14: gnu: nanodbc: Update to 2.14.0., guix-commits, 2022/07/27
- 11/14: gnu: console-setup: Fix cross-compilation., guix-commits, 2022/07/27
- 14/14: gnu: libpano13: Update to 2.9.21., guix-commits, 2022/07/27