summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2016-12-19 18:39:19 +0100
committerMarius Bakke <mbakke@fastmail.com>2016-12-19 23:43:47 +0100
commit7d0910d4a7670d353f7eeab44ee72e943fed234b (patch)
tree02dd76611de83f3a10a00d1c15c908244150c892
parent7d8f7ab9be28e212280d91b9b1f66127f1bd5616 (diff)
Revert "gnu: grub: Add dependency on efibootmgr."
This reverts commit 3eee16130d858ae96510ec1c7d38d31290de2699. Reverted in favor of separate grub-efi package. See discussion at https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00765.html .
-rw-r--r--gnu/packages/grub.scm9
1 files changed, 0 insertions, 9 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 866dfcfb256..317ed035736 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -84,12 +84,6 @@
84 (assoc-ref inputs "mdadm") 84 (assoc-ref inputs "mdadm")
85 "/sbin/mdadm\""))) 85 "/sbin/mdadm\"")))
86 86
87 ;; Ditto for efibootmgr.
88 (substitute* "grub-core/osdep/unix/platform.c"
89 (("efibootmgr")
90 (string-append (assoc-ref inputs "efibootmgr")
91 "/sbin/efibootmgr")))
92
93 ;; Make the font visible. 87 ;; Make the font visible.
94 (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") 88 (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
95 (system* "gunzip" "unifont.bdf.gz") 89 (system* "gunzip" "unifont.bdf.gz")
@@ -104,9 +98,6 @@
104 (inputs 98 (inputs
105 `(("gettext" ,gettext-minimal) 99 `(("gettext" ,gettext-minimal)
106 100
107 ;; For {U,}EFI.
108 ("efibootmgr" ,efibootmgr)
109
110 ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and 101 ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and
111 ;; 'grub-install' to recognize mapped devices (LUKS, etc.) 102 ;; 'grub-install' to recognize mapped devices (LUKS, etc.)
112 ("lvm2" ,lvm2) 103 ("lvm2" ,lvm2)