From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYHdB-0004Gl-Dh for guix-patches@gnu.org; Thu, 20 Jul 2017 16:01:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYHd9-0002dn-5W for guix-patches@gnu.org; Thu, 20 Jul 2017 16:01:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYHd9-0002dj-25 for guix-patches@gnu.org; Thu, 20 Jul 2017 16:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dYHd8-0006dK-Ry for guix-patches@gnu.org; Thu, 20 Jul 2017 16:01:02 -0400 Subject: [bug#27705] [PATCH v3 1/4] gnu: grub-efi: Add mtools input. Resent-Message-ID: From: Danny Milosavljevic Date: Thu, 20 Jul 2017 21:44:44 +0200 Message-Id: <20170720194447.796-2-dannym@scratchpost.org> In-Reply-To: <20170720194447.796-1-dannym@scratchpost.org> References: <20170720194447.796-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27705@debbugs.gnu.org * gnu/packages/bootloaders.scm: Add (gnu packages mtools). (grub-efi)[inputs]: Add mtools. [arguments]: Add phase "use-absolute-mtools-path". --- gnu/packages/bootloaders.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 802e8ab8d..7a91e32d9 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages linux) #:use-module (gnu packages man) + #:use-module (gnu packages mtools) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -149,6 +150,7 @@ menu to select one of the installed operating systems.") (synopsis "GRand Unified Boot loader (UEFI version)") (inputs `(("efibootmgr" ,efibootmgr) + ("mtools", mtools) ,@(package-inputs grub))) (arguments `(;; TODO: Tests need a UEFI firmware for qemu. There is one at @@ -166,7 +168,19 @@ menu to select one of the installed operating systems.") (("efibootmgr") (string-append (assoc-ref inputs "efibootmgr") "/sbin/efibootmgr"))) - #t))))))))) + #t)) + (add-after 'patch-stuff 'use-absolute-mtools-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((mtools (assoc-ref inputs "mtools"))) + (substitute* "util/grub-mkrescue.c" + (("\"mformat\"") + (string-append "\"" mtools + "/bin/mformat\""))) + (substitute* "util/grub-mkrescue.c" + (("\"mcopy\"") + (string-append "\"" mtools + "/bin/mcopy\""))) + #t)))))))))) (define-public syslinux (let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))