[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 10:54:45 +0200 |
* 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 d4ea12be95..c695177c9a 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")
--
2.17.1
- [bug#36477] [PATCH v2 48/61] gnu: guile-xcb: Fix cross-compilation., (continued)
- [bug#36477] [PATCH v2 48/61] gnu: guile-xcb: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 40/61] gnu: procps: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 49/61] gnu: guile-wm: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 43/61] gnu: guile-gcrypt: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 44/61] gnu: libtool: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 50/61] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 52/61] gnu: mdadm: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 54/61] linux-initrd: Use native gzip., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 46/61] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 45/61] gnu: texinfo-4: Fix cross compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v2 47/61] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 55/61] gnu: linux-libre: Enable built-in ext4 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 58/61] utils: Use target-arm64? and target-arm? helpers., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 56/61] gexp: Use cross extensions when cross-compiling., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 60/61] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 61/61] scripts: system: Add --target option., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 59/61] system: vm: Add arm64 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 57/61] gexp: Pass target to compiled-modules in lower-gexp., Mathieu Othacehe, 2019/08/21