mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +00:00
40eff710af
Reverts NixOS/nixpkgs#269620 -eab0837b68caused a mass-rebuild on master - self-merge on a critical package without review and not waiting for the active owner team Below are the reverts of the commits from that PR Revert "systemd: migrate to by-name" This reverts commit33d2a40d67. Revert "systemd: add meta.longDescription" This reverts commit7c588d141d. Revert "systemd: cosmetic rewording of code" This reverts commitd91b8d9fcb. Revert "systemd: cosmetic rewording of comments" This reverts commitbc563998c0. Revert "systemd: remove some redundancy on mesonFlags" This reverts commiteab0837b68. Revert "systemd: use lib.meson* functions" This reverts commit1129756b1a.
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 d8db9d9d22..4601bb5431 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");
|
|
|