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

gnu: grub: Add dependency on GNU Unifont.

Browse source 
* gnu/packages/grub.scm (unifont): New variable.
  (grub)[arguments]: Copy and unzip Unifont in 'patch-stuff' phase.
  [native-inputs]: Add UNIFONT.
This commit is contained in:
Ludovic Courtès 2014-11-08 00:30:52 +01:00
parent ab11f0bed4
commit 9b24c76802
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/grub.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -57,6 +57,17 @@ (define qemu-for-tests
;; The manual fails to build with Texinfo 5.x. ;; The manual fails to build with Texinfo 5.x.
(native-inputs (alist-delete "texinfo" (package-native-inputs qemu))))) (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))
(define unifont
;; GNU Unifont, <http://gnu.org/s/unifont>.
;; GRUB needs it for its graphical terminal, gfxterm.
(origin
(method url-fetch)
(uri
"http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.bdf.gz")
(sha256
(base32
"0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys"))))
(define-public grub (define-public grub
(package (package
(name "grub") (name "grub")
@ -74,10 +85,14 @@ (define-public grub
'(#:configure-flags '("--disable-werror") '(#:configure-flags '("--disable-werror")
#:phases (alist-cons-before #:phases (alist-cons-before
'patch-source-shebangs 'patch-stuff 'patch-source-shebangs 'patch-stuff
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in" (substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz")
;; TODO: Re-enable this test when we have Parted. ;; TODO: Re-enable this test when we have Parted.
(substitute* "tests/partmap_test.in" (substitute* "tests/partmap_test.in"
(("set -e") "exit 77"))) (("set -e") "exit 77")))
@ -89,7 +104,8 @@ (define-public grub
;; ("libusb" ,libusb) ;; ("libusb" ,libusb)
("ncurses" ,ncurses))) ("ncurses" ,ncurses)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("unifont" ,unifont)
("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
;; Dependencies for the test suite. The "real" QEMU is needed here, ;; Dependencies for the test suite. The "real" QEMU is needed here,