Subject: [bug#33405] [PATCH 08/10] guix system: Simplify bootloader package handling.

From: Ludovic Courtès <[email-masked]>
Date: Fri, 16 Nov 2018 10:36:22 +0100

* guix/scripts/system.scm (perform-action): Remove 'bootloader-package'
variable.  Pass (bootloader-package bootloader) as the 2nd argument to
'bootloader-installer-derivation'.  Remove BOOTLOADER-PACKAGE from DRVS
since it's redundant.
---
 guix/scripts/system.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index c0f16cb2a7..14488107b8 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -851,11 +851,6 @@ static checks."
                                                 #:mappings mappings))
        (bootloader -> (bootloader-configuration-bootloader
                        (operating-system-bootloader os)))
-       (bootloader-package
-        (let ((package (bootloader-package bootloader)))
-          (if package
-              (package->derivation package)
-              (return #f))))
        (bootcfg  (if (eq? 'container action)
                      (return #f)
                      (lower-object
@@ -870,17 +865,15 @@ static checks."
         (let ((installer (bootloader-installer bootloader))
               (target    (or target "/")))
           (bootloader-installer-derivation installer
-                                           bootloader-package
+                                           (bootloader-package bootloader)
                                            bootloader-target target)))
 
        ;; For 'init' and 'reconfigure', always build BOOTCFG, even if
        ;; --no-bootloader is passed, because we then use it as a GC root.
        ;; See <http://bugs.gnu.org/21068>.
        (drvs   -> (if (memq action '(init reconfigure))
-                      (if (and install-bootloader? bootloader-package)
-                          (list sys bootcfg
-				bootloader-package
-				bootloader-installer)
+                      (if install-bootloader?
+                          (list sys bootcfg bootloader-installer)
                           (list sys bootcfg))
                       (list sys)))
        (%         (if derivations-only?
-- 
2.19.1