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:
parent
0431ed00e4
commit
04e0eac1ed
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -84,8 +85,9 @@
|
|||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-werror")
|
||||
#:phases (alist-cons-before
|
||||
'patch-source-shebangs 'patch-stuff
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'patch-stuff
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "grub-core/Makefile.in"
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
@ -96,13 +98,15 @@
|
|||
|
||||
;; TODO: Re-enable this test when we have Parted.
|
||||
(substitute* "tests/partmap_test.in"
|
||||
(("set -e") "exit 77")))
|
||||
%standard-phases)))
|
||||
(("set -e") "exit 77"))
|
||||
|
||||
#t)))))
|
||||
(inputs
|
||||
`(;; ("lvm2" ,lvm2)
|
||||
("gettext" ,gnu-gettext)
|
||||
("freetype" ,freetype)
|
||||
;; ("libusb" ,libusb)
|
||||
;; ("fuse" ,fuse)
|
||||
("ncurses" ,ncurses)))
|
||||
(native-inputs
|
||||
`(("unifont" ,unifont)
|
||||
|
|
Loading…
Reference in New Issue