mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:37:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: console-setup: Clean up #:make-flags.

Browse source 
* gnu/packages/xorg.scm (console-setup)[arguments]: Properly
set #:make-flags once.  Use them across all phases.
This commit is contained in:
Tobias Geerinckx-Rice 2022-07-24 02:00:00 +02:00
parent 54c6e39188
commit a2bd3758c1
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/xorg.scm
View file

@ -6586,9 +6586,9 @@ (define-public console-setup
(build-system gnu-build-system)
(arguments
'(#:make-flags
(let ((bash (assoc-ref %build-inputs "bash"))
(out (assoc-ref %outputs "out")))
(list (string-append "SHELL=" bash "/bin/bash")))
(list (string-append "SHELL=" (assoc-ref %build-inputs "bash")
"/bin/bash")
(string-append "prefix=" (assoc-ref %outputs "out")))
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
@ -6601,22 +6601,13 @@ (define-public console-setup
(("\"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"
"doubled_bdfs"
(string-append "SHELL="
(assoc-ref (or native-inputs inputs)
"bash")
"/bin/bash"))))
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "-C" "Fonts" "doubled_bdfs"
make-flags)))
(replace 'install
(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 (or native-inputs inputs)
"bash")
"/bin/bash"))))))))
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "install-linux"
make-flags))))))
(native-inputs
(list pkg-config
bdftopcf