me/guix
Archived
1
0
Fork 0
Code Activity

gnu: grub-minimal: Fix cross-compilation.

Browse source 
Fixes a regression introduced in
34a6f12351 that would break
cross-compilation of 'grub-minimal' because it would enable Freetype
support as a side effect but the 'set-freetype-variables' phase was not
inherited in 'grub-minimal'.

* gnu/packages/bootloaders.scm (grub-minimal)[arguments]: Use
'substitute-keyword-arguments' so that the 'set-freetype-variables'
phase is inherited.
This commit is contained in:
Ludovic Courtès 2020-11-24 10:17:28 +01:00
parent 98f5548cc7
commit 097b725532
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/bootloaders.scm
View file

@ -258,21 +258,25 @@ menu to select one of the installed operating systems.")
(fold alist-delete (package-native-inputs grub) (fold alist-delete (package-native-inputs grub)
'("help2man" "texinfo" "parted" "qemu" "xorriso"))) '("help2man" "texinfo" "parted" "qemu" "xorriso")))
(arguments (arguments
`(#:configure-flags (list "PYTHON=true") (substitute-keyword-arguments (package-arguments grub)
#:phases (modify-phases %standard-phases ((#:configure-flags _ ''())
(add-after 'unpack 'patch-stuff '(list "PYTHON=true"))
(lambda* (#:key native-inputs inputs #:allow-other-keys) ((#:tests? _ #t)
(substitute* "grub-core/Makefile.in" #f)
(("/bin/sh") (which "sh"))) ((#:phases phases '%standard-phases)
`(modify-phases ,phases
(replace 'patch-stuff
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh")))
;; Make the font visible. ;; Make the font visible.
(copy-file (assoc-ref (or native-inputs inputs) (copy-file (assoc-ref (or native-inputs inputs)
"unifont") "unifont")
"unifont.bdf.gz") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz")
#t))) #t))))))))
#:tests? #f))))
(define-public grub-efi (define-public grub-efi
(package (package