mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
28 lines
909 B
Diff
28 lines
909 B
Diff
|
From 5365ffbfba2de03628e8bbb6cc0bc022272436a1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Imuli <i@imu.li>
|
||
|
|
Date: Wed, 19 Oct 2016 08:46:47 -0400
|
||
|
|
Subject: [PATCH 13/27] 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 9fb5152110..9554c2cf76 100644
|
||
|
|
--- a/src/locale/localectl.c
|
||
|
|
+++ b/src/locale/localectl.c
|
||
|
|
@@ -287,7 +287,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.24.1
|
||
|
|
|