[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/14: gnu: console-setup: Use G-expressions.
From: |
guix-commits |
Subject: |
13/14: gnu: console-setup: Use G-expressions. |
Date: |
Wed, 27 Jul 2022 19:08:10 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 0bb061190eca6534951d6ab1ee2e9068f1f9dd20
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 24 02:00:01 2022 +0200
gnu: console-setup: Use G-expressions.
* gnu/packages/xorg.scm (console-setup)[arguments]:
Rewrite as G-expressions.
---
gnu/packages/xorg.scm | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ff633a192c..cbb1dc7779 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6585,29 +6585,30 @@ output.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags
- (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
- (delete 'configure)
- (add-after 'unpack 'patch-file-names
- (lambda* (#:key inputs #:allow-other-keys)
- ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file
- ;; name.
- (substitute* '("Keyboard/ckbcomp")
- (("\"cat ")
- (format #f "\"~a " (search-input-file inputs "bin/cat"))))))
- (add-before 'build 'make-doubled-bdfs
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "-C" "Fonts" "doubled_bdfs"
- make-flags)))
- (replace 'install
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "install-linux"
- make-flags))))))
+ (list #:make-flags
+ #~(list (string-append "SHELL=" (assoc-ref %build-inputs "bash")
+ "/bin/bash")
+ (string-append "prefix=" #$output))
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'patch-file-names
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file
+ ;; name.
+ (substitute* '("Keyboard/ckbcomp")
+ (("\"cat ")
+ (format #f "\"~a "
+ (search-input-file inputs "bin/cat"))))))
+ (add-before 'build 'make-doubled-bdfs
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "-C" "Fonts" "doubled_bdfs"
+ make-flags)))
+ (replace 'install
+ (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, 2022/07/27
- 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 <=
- 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