[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: grub: Add dependency on console-setup.
From: |
guix-commits |
Subject: |
05/06: gnu: grub: Add dependency on console-setup. |
Date: |
Wed, 16 Jan 2019 08:07:47 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit ab100b905f4073b24d69af3de6de61c4c55ce27d
Author: nee <address@hidden>
Date: Wed Jan 16 14:01:17 2019 +0100
gnu: grub: Add dependency on console-setup.
* gnu/packages/bootloaders.scm (grub)[arguments]: In 'patch-stuff'
phase, patch 'grub-kbdcomp.in'.
[inputs]: Add CONSOLE-SETUP.
Co-authored-by: Ludovic Courtès <address@hidden>
---
gnu/packages/bootloaders.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 69b4a90..1cf7720 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Leo Famulari <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
@@ -8,6 +8,7 @@
;;; Copyright © 2016, 2017 David Craven <address@hidden>
;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 nee <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -55,6 +56,7 @@
#:use-module (gnu packages swig)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages virtualization)
+ #:use-module (gnu packages xorg)
#:use-module (gnu packages web)
#:use-module (guix build-system gnu)
#:use-module (guix download)
@@ -110,6 +112,12 @@
;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz")
+
+ ;; Give the absolute file name of 'ckbcomp'.
+ (substitute* "util/grub-kbdcomp.in"
+ (("^ckbcomp ")
+ (string-append (assoc-ref inputs "console-setup")
+ "/bin/ckbcomp ")))
#t))
(add-before 'check 'disable-flaky-test
(lambda _
@@ -134,6 +142,10 @@
;; to determine whether the root file system is RAID.
("mdadm" ,mdadm)
+ ;; Console-setup's ckbcomp is invoked by grub-kbdcomp. It is required
+ ;; for generating alternative keyboard layouts.
+ ("console-setup" ,console-setup)
+
("freetype" ,freetype)
;; ("libusb" ,libusb)
;; ("fuse" ,fuse)
- branch master updated (39ad752 -> a42bdd1), guix-commits, 2019/01/16
- 02/06: install: Avoid deprecated 'gpm-service' procedure., guix-commits, 2019/01/16
- 03/06: bootloader: Remove deprecated 'device' field., guix-commits, 2019/01/16
- 05/06: gnu: grub: Add dependency on console-setup.,
guix-commits <=
- 04/06: doc: Add missing parameter to guix system reconfigure, guix-commits, 2019/01/16
- 06/06: gnu: obs: Update to 22.0.3., guix-commits, 2019/01/16
- 01/06: services: avahi: Deprecate the 'avahi-service' procedure., guix-commits, 2019/01/16