diff options
author | Дамјан Георгиевски <gdamjan@gmail.com> | 2023-02-17 18:03:01 +0100 |
---|---|---|
committer | Дамјан Георгиевски <gdamjan@gmail.com> | 2023-03-05 04:35:34 +0100 |
commit | 575fddf25b672b8ed5d5294ab10a8a22d579bc3b (patch) | |
tree | 2ab7dcf45cc781e5a9b8a0dac05e22c9ecae209e /pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch | |
parent | fb96f99cce403d2012f7353f6691aa91f7462b2c (diff) | |
download | nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar.gz nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar.bz2 nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar.lz nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar.xz nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.tar.zst nixpkgs-575fddf25b672b8ed5d5294ab10a8a22d579bc3b.zip |
systemd: 252.5 -> 253
systemd v253 changelog/NEWS: https://github.com/systemd/systemd/blob/v253/NEWS NixOS changes: 0007-hostnamed-localed-timedated-disable-methods-that-cha.patch was dropped, because systemd gained support to handle read-only /etc. *-add-rootprefix-to-lookup-dir-paths.patch required some updates too, as src/basic/def.h moved to src/basic/constants.h. systemd/systemd#25771 switched p11kit to become dlopen()'ed, so we need to patch that path. added a note to the 23.05 release notes to recommend `nixos-rebuild boot` Co-authored-by: Florian Klink <flokli@flokli.de>
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch new file mode 100644 index 00000000000..fac9916cf3b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -0,0 +1,24 @@ +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 fb83881cc7..c47a33134a 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"); + |