linux_6_1: 6.1.117 -> 6.1.118
[NixPkgs.git] / pkgs / os-specific / linux / systemd / 0008-localectl-use-etc-X11-xkb-for-list-x11.patch
blobfe0dca1863dd111f30ea85c5cb5190ce8dee9617
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Imuli <i@imu.li>
3 Date: Wed, 19 Oct 2016 08:46:47 -0400
4 Subject: [PATCH] localectl: use /etc/X11/xkb for list-x11-*
6 NixOS has an option to link the xkb data files to /etc/X11, but not to
7 /usr/share/X11.
8 ---
9 src/locale/localectl.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
12 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
13 index 32354027f1..1d231f1afc 100644
14 --- a/src/locale/localectl.c
15 +++ b/src/locale/localectl.c
16 @@ -297,7 +297,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
17 } state = NONE, look_for;
18 int r;
20 - f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
21 + f = fopen("/etc/X11/xkb/rules/base.lst", "re");
22 if (!f)
23 return log_error_errno(errno, "Failed to open keyboard mapping list. %m");