diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-07-24 02:00:03 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-07-24 02:00:13 +0200 |
| commit | 54c6e3918805879bf04dec9c397ca622b66e52f9 (patch) | |
| tree | 7421ed4ee42bef6da055953fdb327b35cb8c1749 /gnu | |
| parent | 532bdeff3e1a804cf8d383b4640183afb986a8fd (diff) | |
| download | guix-54c6e3918805879bf04dec9c397ca622b66e52f9.tar.gz | |
gnu: console-setup: Fix cross-compilation.
* gnu/packages/xorg.scm (console-setup)[inputs]: Add bash-minimal and coreutils. [arguments]: Use them in place of the native ones where appropriate.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/xorg.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1636880aaa..6ba5c32dcb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) @@ -6593,13 +6594,12 @@ output.") (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'patch-file-names - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file ;; name. (substitute* '("Keyboard/ckbcomp") (("\"cat ") - (string-append "\"" (which "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" @@ -6621,10 +6621,12 @@ output.") (list pkg-config bdftopcf bdfresize - sharutils ; for 'uuencode' + sharutils ; for 'uuencode' perl)) (inputs - (list perl)) ; used by 'ckbcomp' + (list bash-minimal + coreutils + perl)) ; used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") (description "console-setup provides the console with the same keyboard |