From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWNHn-0008Om-ED for guix-patches@gnu.org; Sat, 15 Jul 2017 09:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWNHi-0006o5-W0 for guix-patches@gnu.org; Sat, 15 Jul 2017 09:39:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dWNHi-0006ny-So for guix-patches@gnu.org; Sat, 15 Jul 2017 09:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dWNHi-0002V8-NJ for guix-patches@gnu.org; Sat, 15 Jul 2017 09:39:02 -0400 Subject: [bug#27705] [PATCH 3/4] gnu: grub-efi: Add grub. Resent-Message-ID: From: Danny Milosavljevic Date: Sat, 15 Jul 2017 15:37:55 +0200 Message-Id: <20170715133756.9883-2-dannym@scratchpost.org> In-Reply-To: <20170715133756.9883-1-dannym@scratchpost.org> References: <20170715133532.9687-1-dannym@scratchpost.org> <20170715133756.9883-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 (grub-efi)[native-inputs]: Add grub. [arguments]: Add phase "install-non-efi". --- gnu/packages/bootloaders.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b6833dff6..f18402e21 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -152,6 +152,9 @@ menu to select one of the installed operating systems.") `(("efibootmgr" ,efibootmgr) ("mtools", mtools) ,@(package-inputs grub))) + (native-inputs + `(("grub" ,grub) + ,@(package-native-inputs grub))) (arguments `(;; TODO: Tests need a UEFI firmware for qemu. There is one at ;; https://github.com/tianocore/edk2/tree/master/OvmfPkg . @@ -180,7 +183,15 @@ menu to select one of the installed operating systems.") (("\"mcopy\"") (string-append "\"" mtools "/bin/mcopy\""))) - #t)))))))))) + #t))) + (add-after 'install 'install-non-efi + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; grub-mkresuce can use it for making a hybrid image. + (copy-recursively (string-append (assoc-ref inputs "grub") + "/lib/grub/i386-pc") + (string-append (assoc-ref outputs "out") + "/lib/grub/i386-pc")) + #t))))))))) (define-public syslinux (let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))