nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: grub: Use modify-phases and other minor cleanups. 

* gnu/packages/grub.scm (grub)[arguments]: Use modify-phases.  Return #t from
  'patch-stuff' phase.  Add 'patch-stuff' phase after 'unpack' instead of
  before 'patch-source-shebangs'.
  [inputs]: Add comment noting that 'fuse' would be a desirable input.
This commit is contained in:
Mark H Weaver 2015-08-15 01:22:06 -04:00 committed by Ludovic Courtès
parent 0431ed00e4
commit 04e0eac1ed
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/grub.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -84,25 +85,28 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-werror") '(#:configure-flags '("--disable-werror")
#:phases (alist-cons-before #:phases (modify-phases %standard-phases
'patch-source-shebangs 'patch-stuff (add-after
(lambda* (#:key inputs #:allow-other-keys) 'unpack 'patch-stuff
(substitute* "grub-core/Makefile.in" (lambda* (#:key inputs #:allow-other-keys)
(("/bin/sh") (which "sh"))) (substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh")))
;; Make the font visible. ;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "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"))
%standard-phases)))
#t)))))
(inputs (inputs
`(;; ("lvm2" ,lvm2) `(;; ("lvm2" ,lvm2)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
("freetype" ,freetype) ("freetype" ,freetype)
;; ("libusb" ,libusb) ;; ("libusb" ,libusb)
;; ("fuse" ,fuse)
("ncurses" ,ncurses))) ("ncurses" ,ncurses)))
(native-inputs (native-inputs
`(("unifont" ,unifont) `(("unifont" ,unifont)