d216b21513
In v248 compiler weirdness and refactoring lead to the bootloader erroring out handling keyboard input on some systems. See https://github.com/systemd/systemd/issues/19191 This should be redundant in v249.6 when it officially gets tagged in systemd-stable. Closes https://github.com/NixOS/nixpkgs/issues/143847
28 lines
909 B
Diff
28 lines
909 B
Diff
From 75d12cf65073458f091899d673c613dfc43f60c0 Mon Sep 17 00:00:00 2001
|
|
From: Imuli <i@imu.li>
|
|
Date: Wed, 19 Oct 2016 08:46:47 -0400
|
|
Subject: [PATCH 10/21] localectl: use /etc/X11/xkb for list-x11-*
|
|
|
|
NixOS has an option to link the xkb data files to /etc/X11, but not to
|
|
/usr/share/X11.
|
|
---
|
|
src/locale/localectl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
|
|
index 548ac8eb2c..5e372f1566 100644
|
|
--- a/src/locale/localectl.c
|
|
+++ b/src/locale/localectl.c
|
|
@@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
|
|
} state = NONE, look_for;
|
|
int r;
|
|
|
|
- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
|
|
+ f = fopen("/etc/X11/xkb/rules/base.lst", "re");
|
|
if (!f)
|
|
return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
|
|
|
|
--
|
|
2.33.0
|
|
|