[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation. |
Date: |
Mon, 2 Sep 2019 17:33:21 +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 d5d983a8d2..ecd8c29f21 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.20.1
- [bug#36477] [PATCH v3 30/48] packages: Set outputs field as thunked., (continued)
[bug#36477] [PATCH v3 29/48] gnu: texinfo-4: Fix cross compilation, Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 32/48] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 33/48] gnu: guile-xcb: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 31/48] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 35/48] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 34/48] gnu: guile-wm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation.,
Mathieu Othacehe <=
[bug#36477] [PATCH v3 26/48] gnu: guile-sqlite3: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 37/48] gnu: mdadm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 44/48] build: vm: Fix arm32 support., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 46/48] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/09/02
[bug#36477] [PATCH v3 42/48] gexp: Pass target to compiled-modules in lower-gexp., Mathieu Othacehe, 2019/09/02