me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Tobias Geerinckx-Rice 2022-07-24 02:00:03 +02:00
parent 532bdeff3e
commit 54c6e39188
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/xorg.scm
View File

@ -66,6 +66,7 @@
#:use-module (gnu packages aidc) #:use-module (gnu packages aidc)
#:use-module (gnu packages anthy) #:use-module (gnu packages anthy)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check) #:use-module (gnu packages check)
@ -6593,13 +6594,12 @@ output.")
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'patch-file-names (add-after 'unpack 'patch-file-names
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; 'ckbcomp' calls out to 'cat' (!). Give it the right file ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file
;; name. ;; name.
(substitute* '("Keyboard/ckbcomp") (substitute* '("Keyboard/ckbcomp")
(("\"cat ") (("\"cat ")
(string-append "\"" (which "cat") (format #f "\"~a " (search-input-file inputs "bin/cat"))))))
" ")))))
(add-before 'build 'make-doubled-bdfs (add-before 'build 'make-doubled-bdfs
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke "make" "-C" "Fonts" (invoke "make" "-C" "Fonts"
@ -6621,10 +6621,12 @@ output.")
(list pkg-config (list pkg-config
bdftopcf bdftopcf
bdfresize bdfresize
sharutils ; for 'uuencode' sharutils ; for 'uuencode'
perl)) perl))
(inputs (inputs
(list perl)) ; used by 'ckbcomp' (list bash-minimal
coreutils
perl)) ; used by 'ckbcomp'
(synopsis "Set up the Linux console font and keyboard") (synopsis "Set up the Linux console font and keyboard")
(description (description
"console-setup provides the console with the same keyboard "console-setup provides the console with the same keyboard