summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-04-30 01:03:18 +0200
committerFlorian Klink <flokli@flokli.de>2020-04-30 01:47:35 +0200
commita3082bc6b796f539cbe02bffbb058966acb629b6 (patch)
tree9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
parent8882516056f19f4a12fabd70084f4f246db9f30c (diff)
downloadnixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am.

These patches were regenerated by running
`git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`,
and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch`
where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
new file mode 100644
index 00000000000..031d7f68009
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -0,0 +1,27 @@
+From d5637ccec3c32919e8aef2dc59b97fdbe3923ba1 Mon Sep 17 00:00:00 2001
+From: Imuli <i@imu.li>
+Date: Wed, 19 Oct 2016 08:46:47 -0400
+Subject: [PATCH 10/18] 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 6f2d37d222..7aa2310d48 100644
+--- a/src/locale/localectl.c
++++ b/src/locale/localectl.c
+@@ -286,7 +286,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.26.2
+