[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/64: gnu: console-setup: Fix cross-compilation.
From: |
guix-commits |
Subject: |
53/64: gnu: console-setup: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:24 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit df093ec88529cf5afdee9bd93847c5a9fc7c1425
Author: Mathieu Othacehe <address@hidden>
Date: Sun Aug 18 12:59:48 2019 +0200
gnu: console-setup: Fix cross-compilation.
* gnu/packages/xorg.scm (console-setup)[native-inputs]: Add perl,
[arguments]: search for bash in both native-inputs and inputs.
---
gnu/packages/xorg.scm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d4ea12b..c695177 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6412,25 +6412,28 @@ output.")
" ")))
#t))
(add-before 'build 'make-doubled-bdfs
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke "make" "-C" "Fonts"
"doubled_bdfs"
(string-append "SHELL="
- (assoc-ref inputs "bash")
+ (assoc-ref (or native-inputs inputs)
+ "bash")
"/bin/bash"))))
(replace 'install
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (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 inputs "bash")
+ (assoc-ref (or native-inputs inputs)
+ "bash")
"/bin/bash"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("bdftopcf" ,bdftopcf)
("bdfresize" ,bdfresize)
- ("sharutils" ,sharutils))) ;for 'uuencode'
+ ("sharutils" ,sharutils) ;for 'uuencode'
+ ("perl" ,perl)))
(inputs
`(("perl" ,perl))) ;used by 'ckbcomp'
(synopsis "Set up the Linux console font and keyboard")
- 62/64: system: vm: Add arm64 support., (continued)
- 62/64: system: vm: Add arm64 support., guix-commits, 2019/08/23
- 15/64: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 14/64: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/23
- 12/64: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/23
- 32/64: gnu: boost: Fix cross-compilation., guix-commits, 2019/08/23
- 39/64: gnu: git: Fix cross-compilation., guix-commits, 2019/08/23
- 50/64: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/08/23
- 49/64: gnu: crda: Fix cross-compilation, guix-commits, 2019/08/23
- 55/64: gnu: grub: Fix cross-compilation., guix-commits, 2019/08/23
- 46/64: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/08/23
- 53/64: gnu: console-setup: Fix cross-compilation.,
guix-commits <=
- 58/64: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/23
- 52/64: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/23
- 18/64: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/23
- 08/64: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/23
- 21/64: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/23
- 23/64: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/23
- 30/64: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/08/23
- 33/64: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/23
- 42/64: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/08/23
- 59/64: gexp: Pass target to compiled-modules in lower-gexp., guix-commits, 2019/08/23