me
/
guix
Archived
1
0
Fork 0
Code

gnu: console-setup: Fix cross-compilation. 

* gnu/packages/xorg.scm (console-setup)[native-inputs]: Add perl,
[arguments]: search for bash in both native-inputs and inputs.
master
Mathieu Othacehe 2019-08-18 12:59:48 +02:00
parent f0d5ce5a11
commit f22997b1a7
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/xorg.scm
View File

@ -6412,25 +6412,28 @@ output.")
" "))) " ")))
#t)) #t))
(add-before 'build 'make-doubled-bdfs (add-before 'build 'make-doubled-bdfs
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke "make" "-C" "Fonts" (invoke "make" "-C" "Fonts"
"doubled_bdfs" "doubled_bdfs"
(string-append "SHELL=" (string-append "SHELL="
(assoc-ref inputs "bash") (assoc-ref (or native-inputs inputs)
"bash")
"/bin/bash")))) "/bin/bash"))))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(invoke "make" "install-linux" (invoke "make" "install-linux"
(string-append "prefix=" out) (string-append "prefix=" out)
(string-append "SHELL=" (string-append "SHELL="
(assoc-ref inputs "bash") (assoc-ref (or native-inputs inputs)
"bash")
"/bin/bash")))))))) "/bin/bash"))))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("bdftopcf" ,bdftopcf) ("bdftopcf" ,bdftopcf)
("bdfresize" ,bdfresize) ("bdfresize" ,bdfresize)
("sharutils" ,sharutils))) ;for 'uuencode' ("sharutils" ,sharutils) ;for 'uuencode'
("perl" ,perl)))
(inputs (inputs
`(("perl" ,perl))) ;used by 'ckbcomp' `(("perl" ,perl))) ;used by 'ckbcomp'
(synopsis "Set up the Linux console font and keyboard") (synopsis "Set up the Linux console font and keyboard")