gnu: grub: Fix cross-compilation.
authorMathieu Othacehe <m.othacehe@gmail.com>
Sun, 18 Aug 2019 11:02:21 +0000 (13:02 +0200)
committerMathieu Othacehe <m.othacehe@gmail.com>
Wed, 4 Sep 2019 16:14:25 +0000 (18:14 +0200)
* gnu/packages/bootloaders.scm (grub)[arguments]: Search for unifont in both
native-inputs and inputs.

gnu/packages/bootloaders.scm

index 41a2de9..b235e1b 100644 (file)
@@ -99,7 +99,7 @@
        (list "PYTHON=true")
        #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'patch-stuff
-                   (lambda* (#:key inputs #:allow-other-keys)
+                   (lambda* (#:key native-inputs inputs #:allow-other-keys)
                      (substitute* "grub-core/Makefile.in"
                        (("/bin/sh") (which "sh")))
 
                                        "/sbin/mdadm\"")))
 
                      ;; Make the font visible.
-                     (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
+                     (copy-file (assoc-ref (or native-inputs inputs)
+                                           "unifont")
+                                "unifont.bdf.gz")
                      (system* "gunzip" "unifont.bdf.gz")
 
                      ;; Give the absolute file name of 'ckbcomp'.