ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: console-setup: Fix cross-compilation.

Browse source 
* gnu/packages/xorg.scm (console-setup)[inputs]: Add bash-minimal and
coreutils.
[arguments]: Use them in place of the native ones where appropriate.
This commit is contained in:
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 @@ (define-module (gnu packages xorg)
#: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 @@ (define-public console-setup
(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 @@ (define-public console-setup
(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