748378a3ec
Removed patches: - 0007-Fix-hwdb-paths.patch The directory we want seems to already be included in the list. Is there a reason why we want to restrict it further? - 0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch This patch has little to do with how the meson.build file looks now. The new patch 0017 is the successor to this one. - 0015-pkg-config-derive-prefix-from-prefix.patch This is fixed upstream. We don't need this anymore.
25 lines
891 B
Diff
25 lines
891 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Imuli <i@imu.li>
|
|
Date: Wed, 19 Oct 2016 08:46:47 -0400
|
|
Subject: [PATCH] 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 32354027f1..1d231f1afc 100644
|
|
--- a/src/locale/localectl.c
|
|
+++ b/src/locale/localectl.c
|
|
@@ -297,7 +297,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");
|
|
|