mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
kbd: Rename some keymaps.
From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g. "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.
Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.
fixes #47878
(cherry picked from commit f1987fb58f)
This commit is contained in:
committed by
Jörg Thalheim
parent
3ab942ef67
commit
df6d40feb6
@@ -25,6 +25,19 @@ stdenv.mkDerivation rec {
|
||||
# Add Neo keymap subdirectory
|
||||
sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
|
||||
|
||||
# Renaming keymaps with name clashes, because loadkeys just picks
|
||||
# the first keymap it sees. The clashing names lead to e.g.
|
||||
# "loadkeys no" defaulting to a norwegian dvorak map instead of
|
||||
# the much more common qwerty one.
|
||||
pushd data/keymaps/i386
|
||||
mv qwertz/cz{,-qwertz}.map
|
||||
mv olpc/es{,-olpc}.map
|
||||
mv olpc/pt{,-olpc}.map
|
||||
mv dvorak/{no.map,dvorak-no.map}
|
||||
mv fgGIod/trf{,-fgGIod}.map
|
||||
mv colemak/{en-latin9,colemak}.map
|
||||
popd
|
||||
|
||||
# Fix the path to gzip/bzip2.
|
||||
substituteInPlace src/libkeymap/findfile.c \
|
||||
--replace gzip ${gzip}/bin/gzip \
|
||||
|
||||
Reference in New Issue
Block a user