summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-04-14 21:50:05 +0200
committerFlorian Klink <flokli@flokli.de>2023-04-14 21:54:03 +0200
commit16ee1b18a485568a7c7164e6348f58768338ae2a (patch)
tree082a7aebd50dc294ecdea7c833c2bda91f0be417 /pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch
parent4e0210b76d8e9e69cf901b37cb53f55ff7e022c5 (diff)
downloadnixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar.gz
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar.bz2
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar.lz
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar.xz
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.tar.zst
nixpkgs-16ee1b18a485568a7c7164e6348f58768338ae2a.zip
systemd: re-introduce hostnamed-localed-timedated-disable-methods-that-cha.patch
In NixOS, /etc is NOT read-only, and most things in /etc are symlinks
to /etc/static, which is a symlink into the nix store - so the upstream
systemd "/etc is read-only" detection doesn't work.

Fixes #224080.
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.patch24
1 files changed, 0 insertions, 24 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
deleted file mode 100644
index fac9916cf3b..00000000000
--- a/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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");
-